Implementation of 1-Wire with added Alarm Search Functionality
Dependents: Max32630_One_Wire_Interface
Diff: Masters/DS2465/DS2465.cpp
- Revision:
- 139:f0e0a7976846
- Parent:
- 122:955ac6c82533
- Child:
- 141:cf38f48a2a49
diff -r 5bd0a7a82bb4 -r f0e0a7976846 Masters/DS2465/DS2465.cpp --- a/Masters/DS2465/DS2465.cpp Fri Dec 02 19:21:55 2016 +0000 +++ b/Masters/DS2465/DS2465.cpp Tue Dec 13 13:31:30 2016 -0800 @@ -160,7 +160,7 @@ ISha256MacCoproc::CmdResult DS2465::setMasterSecret(const Secret & masterSecret) { OneWireMaster::CmdResult result; - result = writeMemory(Scratchpad, masterSecret, masterSecret.length); + result = writeMemory(Scratchpad, masterSecret.data(), masterSecret.size()); if (result == OneWireMaster::Success) { result = copyScratchpadToSecret(); @@ -176,7 +176,7 @@ { OneWireMaster::CmdResult result; // Write input data to scratchpad - result = writeScratchpad(writeMacData, writeMacData.length); + result = writeScratchpad(writeMacData.data(), writeMacData.size()); // Compute MAC if (result == OneWireMaster::Success) { @@ -186,7 +186,7 @@ { wait_ms(shaComputationDelayMs); // Read MAC from register - result = readMemory(MacReadoutReg, mac, mac.length, true); + result = readMemory(MacReadoutReg, mac.data(), mac.size(), true); } return (result == OneWireMaster::Success ? ISha256MacCoproc::Success : ISha256MacCoproc::OperationFailure); } @@ -196,16 +196,16 @@ OneWireMaster::CmdResult result; int addr = Scratchpad; // Write input data to scratchpad - result = cWriteMemory(addr, devicePage, devicePage.length); + result = cWriteMemory(addr, devicePage.data(), devicePage.size()); if (result == OneWireMaster::Success) { - addr += devicePage.length; - result = cWriteMemory(addr, challenge, challenge.length); + addr += devicePage.size(); + result = cWriteMemory(addr, challenge.data(), challenge.size()); } if (result == OneWireMaster::Success) { - addr += challenge.length; - result = cWriteMemory(addr, authMacData, authMacData.length); + addr += challenge.size(); + result = cWriteMemory(addr, authMacData.data(), authMacData.size()); } // Compute MAC if (result == OneWireMaster::Success) @@ -216,7 +216,7 @@ { wait_ms(shaComputationDelayMs * 2); // Read MAC from register - result = readMemory(MacReadoutReg, mac, mac.length, true); + result = readMemory(MacReadoutReg, mac.data(), mac.size(), true); } return (result == OneWireMaster::Success ? ISha256MacCoproc::Success : ISha256MacCoproc::OperationFailure); } @@ -226,16 +226,16 @@ OneWireMaster::CmdResult result; int addr = Scratchpad; // Write input data to scratchpad - result = writeMemory(addr, devicePage, devicePage.length); + result = writeMemory(addr, devicePage.data(), devicePage.size()); if (result == OneWireMaster::Success) { - addr += devicePage.length; - result = writeMemory(addr, deviceScratchpad, deviceScratchpad.length); + addr += devicePage.size(); + result = writeMemory(addr, deviceScratchpad.data(), deviceScratchpad.size()); } if (result == OneWireMaster::Success) { - addr += deviceScratchpad.length; - result = writeMemory(addr, slaveSecretData, slaveSecretData.length); + addr += deviceScratchpad.size(); + result = writeMemory(addr, slaveSecretData.data(), slaveSecretData.size()); } // Compute secret if (result == OneWireMaster::Success)