Reverted default branch to stable-1.5.

This commit is contained in:
Florian Pose
2014-11-03 15:20:05 +01:00
parent 8479fd7675
commit 99418519bd
664 changed files with 837025 additions and 12883 deletions
+5 -2
View File
@@ -82,9 +82,12 @@ void CommandData::execute(const StringVector &args)
MasterIndexList::const_iterator mi;
for (mi = masterIndices.begin();
mi != masterIndices.end(); mi++) {
ec_ioctl_master_t io;
MasterDevice m(*mi);
m.open(MasterDevice::Read);
domains = selectedDomains(m);
m.getMaster(&io);
domains = selectedDomains(m, io);
for (di = domains.begin(); di != domains.end(); di++) {
outputDomainData(m, *di);
@@ -102,7 +105,7 @@ void CommandData::outputDomainData(
ec_ioctl_domain_data_t data;
unsigned char *processData;
unsigned int i;
if (!domain.data_size)
return;