diff -r 5b04770444df -r 742607c464c4 tool/MasterDevice.cpp --- a/tool/MasterDevice.cpp Tue Feb 02 19:38:32 2010 +0100 +++ b/tool/MasterDevice.cpp Fri Feb 05 10:29:47 2010 +0100 @@ -69,15 +69,15 @@ stringstream deviceName; if (fd == -1) { // not already open - deviceName << "/dev/EtherCAT" << index; - - if ((fd = ::open(deviceName.str().c_str(), - perm == ReadWrite ? O_RDWR : O_RDONLY)) == -1) { - stringstream err; - err << "Failed to open master device " << deviceName.str() << ": " - << strerror(errno); - throw MasterDeviceException(err); - } + deviceName << "/dev/EtherCAT" << index; + + if ((fd = ::open(deviceName.str().c_str(), + perm == ReadWrite ? O_RDWR : O_RDONLY)) == -1) { + stringstream err; + err << "Failed to open master device " << deviceName.str() << ": " + << strerror(errno); + throw MasterDeviceException(err); + } } } @@ -86,9 +86,9 @@ void MasterDevice::close() { if (fd != -1) { - ::close(fd); - fd = -1; - } + ::close(fd); + fd = -1; + } } /****************************************************************************/ @@ -427,7 +427,7 @@ stringstream err; err << "Failed to set debug level: " << strerror(errno); throw MasterDeviceException(err); - } + } } /****************************************************************************/ @@ -442,7 +442,7 @@ err << "Failed to download SDO: " << strerror(errno); throw MasterDeviceException(err); } - } + } } /****************************************************************************/