Diff: SensorNode.cpp

Revision:

6:b6bafd0a7013

Parent:

1:e1c7c1c636af

Child:

7:e24f0b29f1f7

diff -r 63232ef22abe -r b6bafd0a7013 SensorNode.cpp
--- a/SensorNode.cpp	Wed Apr 20 20:13:33 2016 +0000
+++ b/SensorNode.cpp	Thu May 12 14:40:14 2016 -0500
@@ -33,8 +33,8 @@
 
 #include "SensorNode.hpp"
 #include "common.hpp"
-#include "OneWire_Masters/DS2465/DS2465.hpp"
-#include "mbed.h"
+#include "Masters/DS2465/DS2465.h"
+#include "I2C.h"
 
 #ifdef TARGET_MAX32600
 #include "max32600.h"
@@ -44,6 +44,12 @@
 #include <cstdlib>
 #endif
 
+using OneWire::Masters::OneWireMaster;
+using OneWire::Masters::DS2465;
+using OneWire::OneWireSlave;
+using OneWire::Authenticators::DS28E15_22_25;
+using OneWire::Authenticators::ISha256MacCoproc;
+
 bool SensorNode::rngInitialized = false;
 
 void SensorNode::initializeRng()
@@ -57,7 +63,7 @@
 #endif
 }
 
-SensorNode::SensorNode(I2C & i2c, std::uint8_t ds7505_i2c_addr, std::uint8_t max44009_i2c_addr, DS2465 & ds2465)
+SensorNode::SensorNode(mbed::I2C & i2c, uint8_t ds7505_i2c_addr, uint8_t max44009_i2c_addr, DS2465 & ds2465)
   : m_initialLux(1), ds28e15_22_25(ds2465), ds7505(i2c, ds7505_i2c_addr), max44009(i2c, max44009_i2c_addr), ds2465(ds2465)
 {
   if (!rngInitialized)
@@ -84,7 +90,7 @@
   // Calculate secret
   if (result)
   {
-    result = (DS28E15_22_25::computeNextSecret(ds2465, pageData, authData.pageNum, scratchpad, ds28e15_22_25.romId, ds28e15_22_25.manId) == ISha256MacCoprocessor::Success);
+    result = (DS28E15_22_25::computeNextSecret(ds2465, pageData, authData.pageNum, scratchpad, ds28e15_22_25.romId, ds28e15_22_25.manId) == ISha256MacCoproc::Success);
   }
   return result;
 }
@@ -136,7 +142,7 @@
 #else
   std::srand(userEntropy);
 #endif
-  for (std::size_t i = 0; i < challenge.length; i++)
+  for (size_t i = 0; i < challenge.length; i++)
   {
 #ifdef TARGET_MAX32600
     challenge[i] = MXC_TPU->prng_rnd_num;
@@ -160,7 +166,7 @@
     return false;
   // Compute expected MAC
   DS28E15_22_25::Mac controllerMac;
-  if (DS28E15_22_25::computeAuthMac(ds2465, pageData, authData.pageNum, challenge, ds28e15_22_25.romId, ds28e15_22_25.manId, controllerMac) != ISha256MacCoprocessor::Success)
+  if (DS28E15_22_25::computeAuthMac(ds2465, pageData, authData.pageNum, challenge, ds28e15_22_25.romId, ds28e15_22_25.manId, controllerMac) != ISha256MacCoproc::Success)
     return false;
   // Check if authentic
   return (nodeMac == controllerMac);