equal
deleted
inserted
replaced
141 } else { // alias and position given |
141 } else { // alias and position given |
142 lastAlias = 0; |
142 lastAlias = 0; |
143 aliasIndex = 0; |
143 aliasIndex = 0; |
144 for (i = 0; i < numSlaves; i++) { |
144 for (i = 0; i < numSlaves; i++) { |
145 m.getSlave(&slave, i); |
145 m.getSlave(&slave, i); |
146 if (slave.alias) { // FIXME 'lock' first alias |
146 if (slave.alias && slave.alias == (uint16_t) alias) { |
147 lastAlias = slave.alias; |
147 lastAlias = slave.alias; |
148 aliasIndex = 0; |
148 aliasIndex = 0; |
149 } |
149 } |
150 if (lastAlias == (uint16_t) alias |
150 if (lastAlias && aliasIndex == (unsigned int) position) { |
151 && aliasIndex == (unsigned int) position) { |
|
152 list.push_back(slave); |
151 list.push_back(slave); |
153 } |
152 } |
154 aliasIndex++; |
153 aliasIndex++; |
155 } |
154 } |
156 } |
155 } |