From ce6a0950797dc140318cad588bfd851dac1855fc Mon Sep 17 00:00:00 2001
From: Andrei Vasiliu <andrei.vasiliu@intel.com>
Date: Thu, 17 Sep 2015 12:16:35 +0300
Subject: [PATCH] misc: Removed mraa_init and mraa::init

This change is due to commit 35760929dbb912fc3dfc738fee67c4f0dd63d55f
from MRAA.

Signed-off-by: Andrei Vasiliu <andrei.vasiliu@intel.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
---
 src/adafruitss/adafruitss.cxx       | 2 +-
 src/apds9002/apds9002.cxx           | 1 -
 src/enc03r/enc03r.cxx               | 2 --
 src/groveehr/groveehr.cxx           | 2 --
 src/groveloudness/groveloudness.cxx | 1 -
 src/hcsr04/hcsr04.cxx               | 2 --
 src/my9221/my9221.cxx               | 1 -
 src/nrf24l01/nrf24l01.cxx           | 2 +-
 src/st7735/st7735.cxx               | 2 --
 src/stepmotor/stepmotor.cxx         | 2 --
 10 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/adafruitss/adafruitss.cxx b/src/adafruitss/adafruitss.cxx
index 4a891c1c..1bd967ac 100644
--- a/src/adafruitss/adafruitss.cxx
+++ b/src/adafruitss/adafruitss.cxx
@@ -47,7 +47,7 @@ adafruitss::adafruitss(int bus,int i2c_address)
                                     ": mraa_i2c_address() failed");
         return;
       }
-        
+
     m_rx_tx_buf[0]=PCA9685_MODE1;
     m_rx_tx_buf[1]=0;
     if (mraa_i2c_write(m_i2c,m_rx_tx_buf,2) != MRAA_SUCCESS)
diff --git a/src/apds9002/apds9002.cxx b/src/apds9002/apds9002.cxx
index 1fe8be1f..cd3138ef 100644
--- a/src/apds9002/apds9002.cxx
+++ b/src/apds9002/apds9002.cxx
@@ -32,7 +32,6 @@ using namespace upm;
 
 APDS9002::APDS9002(int pin)
 {
-  
   if ( !(m_aio = mraa_aio_init(pin)) ) 
     {
       throw std::invalid_argument(std::string(__FUNCTION__) +
diff --git a/src/enc03r/enc03r.cxx b/src/enc03r/enc03r.cxx
index ae4e3b97..6b1faa84 100644
--- a/src/enc03r/enc03r.cxx
+++ b/src/enc03r/enc03r.cxx
@@ -33,8 +33,6 @@ using namespace std;
 
 ENC03R::ENC03R(int pin, float vref)
 {
-  mraa_init();
-
   if ( !(m_aio = mraa_aio_init(pin)) )
     {
       throw std::invalid_argument(std::string(__FUNCTION__) +
diff --git a/src/groveehr/groveehr.cxx b/src/groveehr/groveehr.cxx
index 3a9750b4..d2b0cd95 100644
--- a/src/groveehr/groveehr.cxx
+++ b/src/groveehr/groveehr.cxx
@@ -33,8 +33,6 @@ using namespace std;
 
 GroveEHR::GroveEHR(int pin)
 {
-  mraa_init();
-
   if ( !(m_gpio = mraa_gpio_init(pin)) )
     {
       throw std::invalid_argument(std::string(__FUNCTION__) +
diff --git a/src/groveloudness/groveloudness.cxx b/src/groveloudness/groveloudness.cxx
index 40a50131..6a6a2848 100644
--- a/src/groveloudness/groveloudness.cxx
+++ b/src/groveloudness/groveloudness.cxx
@@ -32,7 +32,6 @@ using namespace upm;
 
 GroveLoudness::GroveLoudness(int pin)
 {
-  ;
   if ( !(m_aio = mraa_aio_init(pin)) ) 
     {
       throw std::invalid_argument(std::string(__FUNCTION__) +
diff --git a/src/hcsr04/hcsr04.cxx b/src/hcsr04/hcsr04.cxx
index 18e5c628..b89ee0b5 100644
--- a/src/hcsr04/hcsr04.cxx
+++ b/src/hcsr04/hcsr04.cxx
@@ -45,8 +45,6 @@ HCSR04::HCSR04 (uint8_t triggerPin, uint8_t echoPin, void (*fptr)(void *)) {
     mraa_result_t error  = MRAA_SUCCESS;
     m_name              = "HCSR04";
 
-    mraa_init();
-
     m_triggerPinCtx     = mraa_gpio_init (triggerPin);
     if (m_triggerPinCtx == NULL) {
         throw std::invalid_argument(std::string(__FUNCTION__) +
diff --git a/src/my9221/my9221.cxx b/src/my9221/my9221.cxx
index b9fcc8d7..78d21681 100644
--- a/src/my9221/my9221.cxx
+++ b/src/my9221/my9221.cxx
@@ -34,7 +34,6 @@ using namespace upm;
 
 MY9221::MY9221 (uint8_t di, uint8_t dcki) {
     mraa::Result error = mraa::SUCCESS;
-    mraa_init();
 
     // init clock context
     m_clkPinCtx = mraa_gpio_init(dcki);
diff --git a/src/nrf24l01/nrf24l01.cxx b/src/nrf24l01/nrf24l01.cxx
index 24b27142..e447ae43 100644
--- a/src/nrf24l01/nrf24l01.cxx
+++ b/src/nrf24l01/nrf24l01.cxx
@@ -37,7 +37,7 @@ using namespace upm;
 NRF24L01::NRF24L01 (uint8_t cs, uint8_t ce)
                             : m_csnPinCtx(cs), m_cePinCtx(ce), m_spi(0)
 {
-    mraa::init();
+    init (cs, ce);
 }
 
 void
diff --git a/src/st7735/st7735.cxx b/src/st7735/st7735.cxx
index b6bd2416..94b0d788 100644
--- a/src/st7735/st7735.cxx
+++ b/src/st7735/st7735.cxx
@@ -38,8 +38,6 @@ ST7735::ST7735 (uint8_t csLCD, uint8_t cSD, uint8_t rs, uint8_t rst)
     : GFX (160, 128, m_map, font), m_csLCDPinCtx(m_csLCD), m_cSDPinCtx(m_cSD),
       m_rSTPinCtx(m_rST), m_rSPinCtx(m_rS), m_spi(0) {
 
-    mraa::init();
-
     m_csLCD = csLCD;
     m_cSD   = cSD;
     m_rST   = rst;
diff --git a/src/stepmotor/stepmotor.cxx b/src/stepmotor/stepmotor.cxx
index 7e146ae0..1d9262d1 100644
--- a/src/stepmotor/stepmotor.cxx
+++ b/src/stepmotor/stepmotor.cxx
@@ -37,8 +37,6 @@ StepMotor::StepMotor (int dirPin, int stePin)
     mraa::Result error = mraa::SUCCESS;
     m_name = "StepMotor";
 
-    mraa::init();
-
     m_stePin = stePin;
     m_dirPin = dirPin;