From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753084AbbC0Lx6 (ORCPT ); Fri, 27 Mar 2015 07:53:58 -0400 Received: from mga14.intel.com ([192.55.52.115]:32978 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752561AbbC0Lxy (ORCPT ); Fri, 27 Mar 2015 07:53:54 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,478,1422950400"; d="scan'208";a="671450395" From: Irina Tirdea To: Jonathan Cameron , linux-iio@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Irina Tirdea Subject: [PATCH] tools: iio: generic_buffer: Fix generic scale extraction Date: Fri, 27 Mar 2015 13:53:00 +0200 Message-Id: <1427457180-2668-1-git-send-email-irina.tirdea@intel.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When using generic_buffer to read data, the scale is not properly detected for scale shared by type. This is caused by a problem with the generation of generic name out of the full name. E.g.: for current->name in_accel_z, the extracted generic name is "in" (when it should be "in_accel"). This is used in generic_buffer to generate scale and offset paths (in_accel_scale). Consider the in_ or out_ prefix when extracting the generic name from the full name. Signed-off-by: Irina Tirdea --- tools/iio/iio_utils.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/tools/iio/iio_utils.c b/tools/iio/iio_utils.c index aea9282..63fbf99 100644 --- a/tools/iio/iio_utils.c +++ b/tools/iio/iio_utils.c @@ -18,6 +18,11 @@ const char *iio_dir = "/sys/bus/iio/devices/"; +static char * const iio_direction[] = { + "in", + "out", +}; + /** * iioutils_break_up_name() - extract generic name from full channel name * @full_name: the full channel name @@ -28,10 +33,19 @@ int iioutils_break_up_name(const char *full_name, { char *current; char *w, *r; - char *working; + char *working, *prefix = ""; + int i; - current = strdup(full_name); + for (i = 0; i < sizeof(iio_direction) / sizeof(iio_direction[0]); i++) + if (!strncmp(full_name, iio_direction[i], + strlen(iio_direction[i]))) { + prefix = iio_direction[i]; + break; + } + + current = strdup(full_name + strlen(prefix) + 1); working = strtok(current, "_\0"); + w = working; r = working; @@ -43,7 +57,7 @@ int iioutils_break_up_name(const char *full_name, r++; } *w = '\0'; - *generic_name = strdup(working); + asprintf(generic_name, "%s_%s", prefix, working); free(current); return 0; -- 1.9.1