Diff: Slaves/RomIterator.cpp

Revision:

90:c233d1c265ff

Parent:

89:3a0e12c9b898

--- a/Slaves/RomIterator.cpp	Thu Jun 16 10:45:24 2016 -0500
+++ b/Slaves/RomIterator.cpp	Fri Jun 17 15:24:37 2016 -0500
@@ -31,8 +31,10 @@
 **********************************************************************/
 
 #include "RomIterator.h"
+#include "Masters/OneWireMaster.h"
 
 using namespace OneWire;
+using namespace OneWire::RomCommands;
 
 bool ForwardSearchRomIterator::lastDevice() const
 {
@@ -41,29 +43,29 @@
 
 OneWireMaster::CmdResult ForwardSearchRomIterator::selectFirstDevice()
 {
-    return master().OWFirst(searchState);
+    return OWFirst(master(), searchState);
 }
 
 OneWireMaster::CmdResult ForwardSearchRomIterator::selectNextDevice()
 {
-    return master().OWNext(searchState);
+    return OWNext(master(), searchState);
 }
 
 OneWireMaster::CmdResult ForwardSearchRomIterator::reselectCurrentDevice()
 {
-    return master().OWResume();
+    return OWResume(master());
 }
 
 OneWireMaster::CmdResult ForwardSearchRomIterator::selectFirstDeviceInFamily(uint8_t familyCode)
 {
     searchState.findFamily(familyCode);
-    return master().OWNext(searchState);
+    return OWNext(master(), searchState);
 }
 
 OneWireMaster::CmdResult ForwardSearchRomIterator::selectNextFamilyDevice()
 {
     searchState.skipCurrentFamily();
-    return master().OWNext(searchState);
+    return OWNext(master(), searchState);
 }
 
 OneWireMaster::CmdResult SingledropRomIterator::selectDevice(const RomId & romId)
@@ -73,7 +75,7 @@
 
 OneWireMaster::CmdResult MultidropRomIterator::selectDevice(const RomId & romId)
 {
-    return master().OWMatchRom(romId);
+    return OWMatchRom(master(), romId);
 }
 
 OneWireMaster::CmdResult MultidropRomIteratorWithResume::selectDevice(const RomId & romId)
@@ -82,11 +84,11 @@
     
     if (romId == lastRom)
     {
-        result = master().OWResume();
+        result = OWResume(master());
     }
     else
     {
-        result = master().OWMatchRom(romId);
+        result = OWMatchRom(master(), romId);
         lastRom = romId;
     }