Diff: Factory.cpp

Revision:

9:bc3d211d75ce

Parent:

8:594529956266

Child:

14:0962f818bf7f

diff -r 594529956266 -r bc3d211d75ce Factory.cpp
--- a/Factory.cpp	Sat May 14 14:28:31 2016 -0500
+++ b/Factory.cpp	Mon May 16 10:36:49 2016 -0500
@@ -34,13 +34,11 @@
 #include "Factory.hpp"
 #include "SensorNode.hpp"
 #include "common.hpp"
-#include "RomCommands.h"
 #include "Masters/DS2465/DS2465.h"
 #include "Authenticators/DS28E15_22_25/DS28E15_22_25.h"
 #include "wait_api.h"
 
 using namespace OneWire;
-using namespace OneWire::RomCommands;
 
 const uint8_t Factory::masterSecret[] = { 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x21,
                                               0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x31, 0x32 };
@@ -79,22 +77,14 @@
   // Read current protection status
   DS28E15_22_25::BlockProtection protectionStatus;
   bool result;
-  // Select device through Skip ROM
-  result = (OWSkipRom(sensorNode.ds2465) == OneWireMaster::Success);
-  if (result)
-    result = (sensorNode.ds28e15_22_25.readBlockProtection(blockNum, protectionStatus) == OneWireSlave::Success);
+  // Read block protections
+  result = (sensorNode.ds28e15_22_25.readBlockProtection(blockNum, protectionStatus) == OneWireSlave::Success);
   // Check if invalid protections are set
   if (result)
     result = ((protectionStatus.statusByte() & ~(desiredProtection.statusByte())) == 0x00);
-  // Select device through Skip ROM
-  if (result)
-    result = (OWSkipRom(sensorNode.ds2465) == OneWireMaster::Success);
   // Load secret into scratchpad
   if (result)
     result = (sensorNode.ds28e15_22_25.writeScratchpad(validSecret ? masterSecret : invalidMasterSecret) == OneWireSlave::Success);
-  // Select device through Skip ROM
-  if (result)
-    result = (OWSkipRom(sensorNode.ds2465) == OneWireMaster::Success);
   // Load master secret from scratchpad without locking
   if (result)
     result = (sensorNode.ds28e15_22_25.loadSecret(false) == OneWireSlave::Success);
@@ -108,36 +98,21 @@
   DS28E15_22_25::Page pageData;
   std::memset(partialSecret, SensorNode::defaultPaddingByte, partialSecret.length);
   
-  // Select device through Skip ROM
-  if (result)
-    result = (OWSkipRom(sensorNode.ds2465) == OneWireMaster::Success);
   // Read page data
   if (result)
     result = (sensorNode.ds28e15_22_25.readPage(sensorNode.authData.pageNum, pageData, false) == OneWireSlave::Success);
-  // Select device through Skip ROM
-  if (result)
-    result = (OWSkipRom(sensorNode.ds2465) == OneWireMaster::Success);
   // Load partial secret into scratchpad
   if (result)
     result = (sensorNode.ds28e15_22_25.writeScratchpad(partialSecret) == OneWireSlave::Success);
-  // Select device through Skip ROM
-  if (result)
-    result = (OWSkipRom(sensorNode.ds2465) == OneWireMaster::Success);
   // Compute secret
   if (result)
     result = (sensorNode.ds28e15_22_25.computeSecret(sensorNode.authData.pageNum, false) == OneWireSlave::Success);
   // Configure slave secret on DS2465
   if (result)
     result = (DS28E15_22_25::computeNextSecret(sensorNode.ds2465, pageData, sensorNode.authData.pageNum, partialSecret, sensorNode.ds28e15_22_25.romId, sensorNode.ds28e15_22_25.manId) == ISha256MacCoproc::Success);
-  // Select device through Skip ROM
-  if (result)
-    result = (OWSkipRom(sensorNode.ds2465) == OneWireMaster::Success);
   // Enable authentication protection if not set
   if (result && (protectionStatus != desiredProtection))
     result = (sensorNode.ds28e15_22_25.writeAuthBlockProtection(sensorNode.ds2465, desiredProtection, protectionStatus) == OneWireSlave::Success);
-  // Select device through Skip ROM
-  if (result)
-    result = (OWSkipRom(sensorNode.ds2465) == OneWireMaster::Success);
   // Write initial filter life and set all other segments to default value
   if (result)
   {
@@ -145,11 +120,9 @@
     std::memset(blankSegment, SensorNode::defaultPaddingByte, blankSegment.length);
     for (size_t i = 0; i < DS28E15_22_25::segmentsPerPage; i++)
     {
-      result = (OWSkipRom(sensorNode.ds2465) == OneWireMaster::Success);
-      if (result)
-        result = (sensorNode.ds28e15_22_25.writeAuthSegment(sensorNode.ds2465, sensorNode.authData.pageNum, i,
-                                                            ((i == sensorNode.authData.segmentNum) ? sensorNode.authData.segment : blankSegment),
-                                                            pageData.toSegment(i), false) == OneWireSlave::Success);
+      result = (sensorNode.ds28e15_22_25.writeAuthSegment(sensorNode.ds2465, sensorNode.authData.pageNum, i,
+                                                          ((i == sensorNode.authData.segmentNum) ? sensorNode.authData.segment : blankSegment),
+                                                          pageData.toSegment(i), false) == OneWireSlave::Success);
       
       if (!result)
         break;
@@ -157,33 +130,18 @@
   }
   
   // Reload secret with known page values
-  // Select device through Skip ROM
-  if (result)
-    result = (OWSkipRom(sensorNode.ds2465) == OneWireMaster::Success);
   // Load master secret into scratchpad
   if (result)
     result = (sensorNode.ds28e15_22_25.writeScratchpad(masterSecret) == OneWireSlave::Success);
-  // Select device through Skip ROM
-  if (result)
-    result = (OWSkipRom(sensorNode.ds2465) == OneWireMaster::Success);
   // Load master secret
   if (result)
     result = (sensorNode.ds28e15_22_25.loadSecret(false) == OneWireSlave::Success);
-  // Select device through Skip ROM
-  if (result)
-    result = (OWSkipRom(sensorNode.ds2465) == OneWireMaster::Success);
   // Read page data
   if (result)
     result = (sensorNode.ds28e15_22_25.readPage(sensorNode.authData.pageNum, pageData, false) == OneWireSlave::Success);
-  // Select device through Skip ROM
-  if (result)
-    result = (OWSkipRom(sensorNode.ds2465) == OneWireMaster::Success);
   // Write partial secret to scratchpad
   if (result)
     result = (sensorNode.ds28e15_22_25.writeScratchpad(partialSecret) == OneWireSlave::Success);
-  // Select device through Skip ROM
-  if (result)
-    result = (OWSkipRom(sensorNode.ds2465) == OneWireMaster::Success);
   // Compute secret
   if (result)
     result = (sensorNode.ds28e15_22_25.computeSecret(sensorNode.authData.pageNum, false) == OneWireSlave::Success);