diff -r 65781b048a47 -r ec6223c3b7ec tool/CommandRegRead.cpp --- a/tool/CommandRegRead.cpp Tue Feb 23 17:40:46 2010 +0100 +++ b/tool/CommandRegRead.cpp Wed Feb 24 16:27:11 2010 +0100 @@ -32,6 +32,7 @@ using namespace std; #include "CommandRegRead.h" +#include "MasterDevice.h" /*****************************************************************************/ @@ -78,7 +79,7 @@ /****************************************************************************/ -void CommandRegRead::execute(MasterDevice &m, const StringVector &args) +void CommandRegRead::execute(const StringVector &args) { SlaveList slaves; ec_ioctl_slave_reg_t data; @@ -141,6 +142,11 @@ throwInvalidUsageException(err); } + if (getMasterIndices().size() != 1) { + err << getName() << " requires to select a single master!"; + throwInvalidUsageException(err); + } + MasterDevice m(getMasterIndices().front()); m.open(MasterDevice::Read); slaves = selectedSlaves(m);