aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMircea Carausu <mcarausu@broadcom.com>2013-03-07 08:40:34 +0800
committerAndy Green <andy.green@linaro.org>2013-03-07 08:40:34 +0800
commitaf38de180d30632d16b7c8b51f6e8add0dd084d2 (patch)
tree042a8fe9c708bc322b234f1fbdcd6e95ca15f026
parent1642c832850c7a8cf7bb3024ac45b9eb2e8af32f (diff)
Configuration parsing fix
While working with AEP I came across a bug recently introduced (Nov 10) -- it is actually last checkin in this git git://git.linaro.org/tools/arm-probe.git (b3120f0c6e3d77b1654883c59828b787dd759d28) The change was supposed to allow working with partially defined config files (where less than 3 channels are declared for one energy probe). In reality it restricts to one channel per probe (first one) from configuration file, ignoring the other ones. I created a patch that does not have this side effect allowing to work with either fully defined (3 channels per probe) or partial defined config files – tested successfully with both. The fix is 1 line. Signed-off-by: Mircea Carausu <mcarausu@broadcom.com>
-rwxr-xr-x[-rw-r--r--]libarmep/configuration.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libarmep/configuration.c b/libarmep/configuration.c
index 3236483..f6eb9aa 100644..100755
--- a/libarmep/configuration.c
+++ b/libarmep/configuration.c
@@ -246,7 +246,6 @@ int configure(struct aep_context *aep_context, struct aep *aep, const char *dev_
break;
}
actions = APCA_PULL_CHANNELS;
- ch->flag_was_configured = 1;
copy_pos = 0;
no_copy = ch == wch;
break;
@@ -301,6 +300,7 @@ int configure(struct aep_context *aep_context, struct aep *aep, const char *dev_
}
}
+ ch->flag_was_configured = 1;
ch++;
if (aep) {
if (index == CHANNELS_PER_PROBE) {