colin/iio-sensor-proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iio: Simplify setting the scale and presence return values

Browse Source 
The scale should always be set to 1.0 by default, and only ever be
overridden if we could successfully read it from sysfs, and ch_present
is obviously false until we've found the channel in question.
This commit is contained in:
Bastien Nocera
2019-05-13 13:49:06 +02:00
committed by hadess
parent ec0d992c18
commit 4f850f0be5
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/iio-buffer-utils.c
View File

@@ -547,7 +547,7 @@ process_scan_1 (char *data,
{
int k;
*ch_scale = 1.0;
*ch_present = FALSE;
for (k = 0; k < buffer_data->channels_count; k++) {
struct iio_channel_info *info = buffer_data->channels[k];
@@ -569,9 +569,6 @@ process_scan_1 (char *data,
if (info->bits_used < 32)
val &= ((guint32) 1 << info->bits_used) - 1;
*ch_val = (int) val;
if (info->scale)
*ch_scale = info->scale;
*ch_present = TRUE;
} else {
gint32 val = iio_read32(info, (gint8 *) data);
val = val >> info->shift;
@@ -579,9 +576,6 @@ process_scan_1 (char *data,
val &= ((guint32) 1 << info->bits_used) - 1;
val = (gint32) (val << (32 - info->bits_used)) >> (32 - info->bits_used);
*ch_val = (int) val;
if (info->scale)
*ch_scale = info->scale;
*ch_present = TRUE;
}
break;
case 2:
@@ -591,6 +585,9 @@ process_scan_1 (char *data,
g_assert_not_reached ();
break;
}
*ch_scale = info->scale;
*ch_present = TRUE;
}
if (!*ch_present)