Skip to content

Commit f650d3a

Browse files
dNechitadNechita
committed
plugins/fmcomms5: Reenable and update to libiio 1.x API
Signed-off-by: Dan Nechita <[email protected]>
1 parent e906d50 commit f650d3a

File tree

2 files changed

+35
-35
lines changed

2 files changed

+35
-35
lines changed

Diff for: ‎plugins/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ set(PLUGINS
1919
generic_dac
2020
fmcomms2
2121
fmcomms2_adv
22-
#fmcomms5
22+
fmcomms5
2323
#fmcomms6
2424
#fmcomms11
2525
#ad9371

Diff for: ‎plugins/fmcomms5.c

+34-34
Original file line numberDiff line numberDiff line change
@@ -340,57 +340,57 @@ static void glb_settings_update_labels(void)
340340
ssize_t ret;
341341
int i;
342342

343-
ret = iio_device_attr_read(dev1, "ensm_mode", buf, sizeof(buf));
343+
ret = dev_attr_read_raw(dev1, "ensm_mode", buf, sizeof(buf));
344344
if (ret > 0)
345345
gtk_label_set_text(GTK_LABEL(ensm_mode), buf);
346346
else
347347
gtk_label_set_text(GTK_LABEL(ensm_mode), "<error>");
348348

349-
ret = iio_device_attr_read(dev1, "calib_mode", buf, sizeof(buf));
349+
ret = dev_attr_read_raw(dev1, "calib_mode", buf, sizeof(buf));
350350
if (ret > 0)
351351
gtk_label_set_text(GTK_LABEL(calib_mode), buf);
352352
else
353353
gtk_label_set_text(GTK_LABEL(calib_mode), "<error>");
354354

355-
ret = iio_device_attr_read(dev1, "trx_rate_governor", buf, sizeof(buf));
355+
ret = dev_attr_read_raw(dev1, "trx_rate_governor", buf, sizeof(buf));
356356
if (ret > 0)
357357
gtk_label_set_text(GTK_LABEL(trx_rate_governor), buf);
358358
else
359359
gtk_label_set_text(GTK_LABEL(trx_rate_governor), "<error>");
360360

361-
ret = iio_channel_attr_read(
361+
ret = chn_attr_read_raw(
362362
iio_device_find_channel(dev1, "voltage0", false),
363363
"gain_control_mode", buf, sizeof(buf));
364364
if (ret > 0)
365365
gtk_label_set_text(GTK_LABEL(rx_gain_control[1]), buf);
366366
else
367367
gtk_label_set_text(GTK_LABEL(rx_gain_control[1]), "<error>");
368368

369-
ret = iio_channel_attr_read(
369+
ret = chn_attr_read_raw(
370370
iio_device_find_channel(dev1, "voltage1", false),
371371
"gain_control_mode", buf, sizeof(buf));
372372
if (ret > 0)
373373
gtk_label_set_text(GTK_LABEL(rx_gain_control[2]), buf);
374374
else
375375
gtk_label_set_text(GTK_LABEL(rx_gain_control[2]), "<error>");
376376

377-
ret = iio_channel_attr_read(
377+
ret = chn_attr_read_raw(
378378
iio_device_find_channel(dev2, "voltage0", false),
379379
"gain_control_mode", buf, sizeof(buf));
380380
if (ret > 0)
381381
gtk_label_set_text(GTK_LABEL(rx_gain_control[3]), buf);
382382
else
383383
gtk_label_set_text(GTK_LABEL(rx_gain_control[3]), "<error>");
384384

385-
ret = iio_channel_attr_read(
385+
ret = chn_attr_read_raw(
386386
iio_device_find_channel(dev2, "voltage1", false),
387387
"gain_control_mode", buf, sizeof(buf));
388388
if (ret > 0)
389389
gtk_label_set_text(GTK_LABEL(rx_gain_control[4]), buf);
390390
else
391391
gtk_label_set_text(GTK_LABEL(rx_gain_control[4]), "<error>");
392392

393-
ret = iio_device_attr_read(dev1, "rx_path_rates", buf, sizeof(buf));
393+
ret = dev_attr_read_raw(dev1, "rx_path_rates", buf, sizeof(buf));
394394
if (ret > 0) {
395395
sscanf(buf, "BBPLL:%f ADC:%f R2:%f R1:%f RF:%f RXSAMP:%f",
396396
&rates[0], &rates[1], &rates[2], &rates[3], &rates[4],
@@ -404,7 +404,7 @@ static void glb_settings_update_labels(void)
404404
gtk_label_set_text(GTK_LABEL(rx_path_rates), "<error>");
405405
}
406406

407-
ret = iio_device_attr_read(dev1, "tx_path_rates", buf, sizeof(buf));
407+
ret = dev_attr_read_raw(dev1, "tx_path_rates", buf, sizeof(buf));
408408
if (ret > 0) {
409409
sscanf(buf, "BBPLL:%f DAC:%f T2:%f T1:%f TF:%f TXSAMP:%f",
410410
&rates[0], &rates[1], &rates[2], &rates[3], &rates[4],
@@ -481,7 +481,7 @@ static void rssi_update_label(GtkWidget *label, struct iio_device *dev,
481481
if (!gtk_widget_is_drawable(GTK_WIDGET(label)))
482482
return;
483483

484-
ret = iio_channel_attr_read(
484+
ret = chn_attr_read_raw(
485485
iio_device_find_channel(dev, chn, is_tx),
486486
"rssi", buf, sizeof(buf));
487487
if (ret > 0)
@@ -534,14 +534,14 @@ static void filter_fir_update(void)
534534
bool rx = false, tx = false, rxtx = false;
535535
struct iio_channel *chn;
536536

537-
iio_device_attr_read_bool(dev1, "in_out_voltage_filter_fir_en", &rxtx);
537+
dev_attr_read_bool(dev1, "in_out_voltage_filter_fir_en", &rxtx);
538538

539539
chn = iio_device_find_channel(dev1, "voltage0", false);
540540
if (chn)
541-
iio_channel_attr_read_bool(chn, "filter_fir_en", &rx);
541+
chn_attr_read_bool(chn, "filter_fir_en", &rx);
542542
chn = iio_device_find_channel(dev1, "voltage0", true);
543543
if (chn)
544-
iio_channel_attr_read_bool(chn, "filter_fir_en", &tx);
544+
chn_attr_read_bool(chn, "filter_fir_en", &tx);
545545

546546
if (rxtx) {
547547
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (enable_fir_filter_rx_tx), rxtx);
@@ -567,25 +567,25 @@ static void filter_fir_enable(GtkToggleButton *button, gpointer data)
567567
disable = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (disable_all_fir_filters));
568568

569569
if (rxtx || disable) {
570-
iio_device_attr_write_bool(dev1,
570+
dev_attr_write_bool(dev1,
571571
"in_out_voltage_filter_fir_en", rxtx);
572-
iio_device_attr_write_bool(dev2,
572+
dev_attr_write_bool(dev2,
573573
"in_out_voltage_filter_fir_en", rxtx);
574574
} else {
575575
struct iio_channel *chn;
576576
chn = iio_device_find_channel(dev1, "voltage0", true);
577577
if (chn)
578-
iio_channel_attr_write_bool(chn, "filter_fir_en", tx);
578+
chn_attr_write_bool(chn, "filter_fir_en", tx);
579579
chn = iio_device_find_channel(dev2, "voltage0", true);
580580
if (chn)
581-
iio_channel_attr_write_bool(chn, "filter_fir_en", tx);
581+
chn_attr_write_bool(chn, "filter_fir_en", tx);
582582

583583
chn = iio_device_find_channel(dev1, "voltage0", false);
584584
if (chn)
585-
iio_channel_attr_write_bool(chn, "filter_fir_en", rx);
585+
chn_attr_write_bool(chn, "filter_fir_en", rx);
586586
chn = iio_device_find_channel(dev2, "voltage0", false);
587587
if (chn)
588-
iio_channel_attr_write_bool(chn, "filter_fir_en", rx);
588+
chn_attr_write_bool(chn, "filter_fir_en", rx);
589589
}
590590

591591
filter_fir_update();
@@ -613,10 +613,10 @@ static void rx_phase_rotation_update()
613613
out[7] = iio_device_find_channel(cap2, "voltage3", false);
614614

615615
for (i = 0; i < 8; i += 2) {
616-
iio_channel_attr_read_double(out[i], "calibscale", &val[0]);
617-
iio_channel_attr_read_double(out[i], "calibphase", &val[1]);
618-
iio_channel_attr_read_double(out[i + 1], "calibscale", &val[2]);
619-
iio_channel_attr_read_double(out[i + 1], "calibphase", &val[3]);
616+
chn_attr_read_double(out[i], "calibscale", &val[0]);
617+
chn_attr_read_double(out[i], "calibphase", &val[1]);
618+
chn_attr_read_double(out[i + 1], "calibscale", &val[2]);
619+
chn_attr_read_double(out[i + 1], "calibphase", &val[3]);
620620

621621
val[0] = acos(val[0]) * 360.0 / (2.0 * M_PI);
622622
val[1] = asin(-1.0 * val[1]) * 360.0 / (2.0 * M_PI);
@@ -662,10 +662,10 @@ static void dcxo_widgets_update(void)
662662
char val[64];
663663
int ret;
664664

665-
ret = iio_device_attr_read(dev1, "dcxo_tune_coarse", val, sizeof(val));
665+
ret = dev_attr_read_raw(dev1, "dcxo_tune_coarse", val, sizeof(val));
666666
if (ret > 0)
667667
gtk_widget_show(glb_widgets[dcxo_coarse_num].widget);
668-
ret = iio_device_attr_read(dev1, "dcxo_tune_fine", val, sizeof(val));
668+
ret = dev_attr_read_raw(dev1, "dcxo_tune_fine", val, sizeof(val));
669669
if (ret > 0)
670670
gtk_widget_show(glb_widgets[dcxo_fine_num].widget);
671671
}
@@ -702,7 +702,7 @@ static void hide_section_cb(GtkToggleToolButton *btn, GtkWidget *section)
702702

703703
static int write_int(struct iio_channel *chn, const char *attr, int val)
704704
{
705-
return iio_channel_attr_write_longlong(chn, attr, (long long) val);
705+
return chn_attr_write_longlong(chn, attr, (long long) val);
706706
}
707707

708708
static void fastlock_clicked(GtkButton *btn, gpointer data)
@@ -793,10 +793,10 @@ static void rx_phase_rotation_set(GtkSpinButton *spinbutton, gpointer user_data)
793793
}
794794

795795
if (out1 && out0) {
796-
iio_channel_attr_write_double(out0, "calibscale", (double) cos(phase));
797-
iio_channel_attr_write_double(out0, "calibphase", (double) (-1 * sin(phase)));
798-
iio_channel_attr_write_double(out1, "calibscale", (double) cos(phase));
799-
iio_channel_attr_write_double(out1, "calibphase", (double) sin(phase));
796+
chn_attr_write_double(out0, "calibscale", (double) cos(phase));
797+
chn_attr_write_double(out0, "calibphase", (double) (-1 * sin(phase)));
798+
chn_attr_write_double(out1, "calibscale", (double) cos(phase));
799+
chn_attr_write_double(out1, "calibphase", (double) sin(phase));
800800
}
801801
}
802802

@@ -1061,31 +1061,31 @@ static void load_profile(struct osc_plugin *plugin, const char *ini_fn)
10611061
value = read_token_from_ini(ini_fn, THIS_DRIVER,
10621062
PHY_DEVICE1".in_voltage0_gain_control_mode");
10631063
if (ch && value) {
1064-
iio_channel_attr_write(ch, "gain_control_mode", value);
1064+
chn_attr_write_string(ch, "gain_control_mode", value);
10651065
free(value);
10661066
}
10671067

10681068
ch = iio_device_find_channel(dev1, "voltage1", false);
10691069
value = read_token_from_ini(ini_fn, THIS_DRIVER,
10701070
PHY_DEVICE1".in_voltage1_gain_control_mode");
10711071
if (ch && value) {
1072-
iio_channel_attr_write(ch, "gain_control_mode", value);
1072+
chn_attr_write_string(ch, "gain_control_mode", value);
10731073
free(value);
10741074
}
10751075

10761076
ch = iio_device_find_channel(dev2, "voltage0", false);
10771077
value = read_token_from_ini(ini_fn, THIS_DRIVER,
10781078
PHY_DEVICE2".in_voltage0_gain_control_mode");
10791079
if (ch && value) {
1080-
iio_channel_attr_write(ch, "gain_control_mode", value);
1080+
chn_attr_write_string(ch, "gain_control_mode", value);
10811081
free(value);
10821082
}
10831083

10841084
ch = iio_device_find_channel(dev2, "voltage1", false);
10851085
value = read_token_from_ini(ini_fn, THIS_DRIVER,
10861086
PHY_DEVICE2".in_voltage1_gain_control_mode");
10871087
if (ch && value) {
1088-
iio_channel_attr_write(ch, "gain_control_mode", value);
1088+
chn_attr_write_string(ch, "gain_control_mode", value);
10891089
free(value);
10901090
}
10911091

0 commit comments

Comments
 (0)