Raspberries/mraa
Private
Public Access
2
0
Fork 0
Code Activity

spi: mraa_spi_write_word can now return -1 in error cases

Browse Source 
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Brendan Le Foll
2016-04-25 15:11:08 +01:00
parent b258867c37
commit c524c3d372
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/mraa/spi.h
View File

@@ -117,7 +117,7 @@ int mraa_spi_write(mraa_spi_context dev, uint8_t data);
* @param data Data to send * @param data Data to send
* @return Data received on the miso line * @return Data received on the miso line
*/ */
uint16_t mraa_spi_write_word(mraa_spi_context dev, uint16_t data); int mraa_spi_write_word(mraa_spi_context dev, uint16_t data);
/** /**
* Write Buffer of bytes to the SPI device. The pointer return has to be * Write Buffer of bytes to the SPI device. The pointer return has to be

4
api/mraa/spi.hpp
View File

@@ -127,9 +127,9 @@ class Spi
* Write single byte to the SPI device * Write single byte to the SPI device
* *
* @param data the byte to send * @param data the byte to send
* @return data received on the miso line * @return data received on the miso line or -1 in case of error
*/ */
uint16_t int
write_word(uint16_t data) write_word(uint16_t data)
{ {
return mraa_spi_write_word(m_spi, (uint16_t) data); return mraa_spi_write_word(m_spi, (uint16_t) data);

4
src/spi/spi.c
View File

@@ -267,7 +267,7 @@ mraa_spi_write(mraa_spi_context dev, uint8_t data)
return (int) recv; return (int) recv;
} }
uint16_t int
mraa_spi_write_word(mraa_spi_context dev, uint16_t data) mraa_spi_write_word(mraa_spi_context dev, uint16_t data)
{ {
struct spi_ioc_transfer msg; struct spi_ioc_transfer msg;
@@ -286,7 +286,7 @@ mraa_spi_write_word(mraa_spi_context dev, uint16_t data)
syslog(LOG_ERR, "spi: Failed to perform dev transfer"); syslog(LOG_ERR, "spi: Failed to perform dev transfer");
return -1; return -1;
} }
return recv; return (int) recv;
} }
mraa_result_t mraa_result_t