From 9e20268bb8c560fb7f12d07325ac93b84a0e7dde Mon Sep 17 00:00:00 2001
From: Jon Trulson <jtrulson@ics.com>
Date: Thu, 10 Sep 2015 13:26:21 -0600
Subject: [PATCH] lsm303: throw exception(s) on fatal errors

Signed-off-by: Jon Trulson <jtrulson@ics.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
---
 src/lsm303/lsm303.cxx | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/lsm303/lsm303.cxx b/src/lsm303/lsm303.cxx
index 1912ffd6..87d4afe2 100644
--- a/src/lsm303/lsm303.cxx
+++ b/src/lsm303/lsm303.cxx
@@ -26,6 +26,8 @@
  */
 
 #include <iostream>
+#include <string>
+#include <stdexcept>
 #include <unistd.h>
 #include <stdlib.h>
 
@@ -35,8 +37,6 @@ using namespace upm;
 
 LSM303::LSM303(int bus, int addrMag, int addrAcc, int accScale) : m_i2c(bus)
 {
-    mraa::Result ret = mraa::SUCCESS;
-
     m_addrMag = addrMag;
     m_addrAcc = addrAcc;
 
@@ -184,17 +184,21 @@ LSM303::setRegisterSafe(uint8_t slave, uint8_t sregister, uint8_t data)
 {
     buf[0] = sregister;
     buf[1] = data;
+
     if (m_i2c.address(slave) != mraa::SUCCESS) {
-        fprintf(stderr, "lsm303: Failed to connect to slave\n");
+        throw std::invalid_argument(std::string(__FUNCTION__) +
+                                    ": mraa_i2c_address() failed");
         return mraa::ERROR_INVALID_HANDLE;
     }
     if (m_i2c.write(buf, 2) != mraa::SUCCESS) {
-        fprintf(stderr, "lsm303: Failed to write to register\n");
+        throw std::invalid_argument(std::string(__FUNCTION__) +
+                                    ": mraa_i2c_write() failed");
         return mraa::ERROR_INVALID_HANDLE;
     }
     uint8_t val = m_i2c.readReg(sregister);
     if (val != data) {
-        fprintf(stderr, "lsm303: Failed to set register correctly\n");
+        throw std::invalid_argument(std::string(__FUNCTION__) +
+                                    ": failed to set register correctly");
         return mraa::ERROR_UNSPECIFIED;
     }
     return mraa::SUCCESS;