misc: Minor fixes due to previous rebase

Signed-off-by: Andrei Vasiliu <andrei.vasiliu@intel.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Andrei Vasiliu
2015-09-18 16:33:53 +03:00
committed by Mihai Tudor Panu
parent 428bac360b
commit 5e72c4febd
13 changed files with 14 additions and 153 deletions

View File

@ -1463,7 +1463,7 @@ void PN532::readData(uint8_t* buff, uint8_t n)
memset(buf, 0, n+2);
usleep(2000);
if (m_i2c.address(m_addr) != MRAA_SUCCESS)
if (m_i2c.address(m_addr) != mraa::SUCCESS)
{
throw std::runtime_error(std::string(__FUNCTION__) +
": mraa_i2c_address() failed");
@ -1537,14 +1537,14 @@ void PN532::writeCommand(uint8_t* cmd, uint8_t cmdlen)
buf[offset++] = ~checksum;
buf[offset] = PN532_POSTAMBLE;
if (m_i2c.address(m_addr) != MRAA_SUCCESS)
if (m_i2c.address(m_addr) != mraa::SUCCESS)
{
throw std::runtime_error(std::string(__FUNCTION__) +
": mraa_i2c_address() failed");
return;
}
if (m_i2c.write(buf, cmdlen + 8 - 1) != MRAA_SUCCESS)
if (m_i2c.write(buf, cmdlen + 8 - 1) != mraa::SUCCESS)
{
throw std::runtime_error(std::string(__FUNCTION__) +
": mraa_i2c_write() failed");