wip migration, squash this, adcplugin.cpp last partial modify

Signed-off-by: Andrei-Fabian-Pop <Andreifabian.Pop@analog.com>

Author: Andrei-Fabian-Pop

CMakeLists.txt

@@ -108,7 +108,7 @@ endif()
 
 find_path(
 	IIO_INCLUDE_DIRS
-	NAMES iio.h
+	NAMES iio/iio.h
 	HINTS ${CMAKE_INSTALL_PREFIX}/include
 	      /include
 	      /usr/include

core/include/core/scopyhomeaddpage.h

@@ -30,8 +30,6 @@
 #include "pluginmanager.h"
 #include "scopy-core_export.h"
 
-#include <iio.h>
-
 #include <QFuture>
 #include <QStackedWidget>
 #include <QWidget>

core/src/iiodeviceimpl.cpp

@@ -21,7 +21,10 @@
 
 #include "iiodeviceimpl.h"
 
-#include "iioutil/connectionprovider.h"
+#include <iioutil/connectionprovider.h>
+#include <iioutil/iiocpp/iioresult.h>
+#include <iioutil/iiocpp/iioattribute.h>
+#include <iioutil/iiocpp/iiocontext.h>
 
 #include <QLoggingCategory>
 
@@ -56,12 +59,16 @@ QMap<QString, QString> IIODeviceImpl::readDeviceInfo()
 	if(!conn) {
 		qWarning(CAT_IIO_DEVICEIMPL) << "Cannot read the device info! (unavailable context)";
 	} else {
-		for(int i = 0; i < iio_context_get_attrs_count(conn->context()); i++) {
-			const char *name;
-			const char *value;
-			int ret = iio_context_get_attr(conn->context(), i, &name, &value);
-			if(ret != 0)
+		for(int i = 0; i < IIOContext::get_attrs_count(conn->context()); i++) {
+			IIOResult<const iio_attr *> attrRes = IIOContext::get_attr(conn->context(), i);
+			if(!attrRes.ok()) {
+				qWarning(CAT_IIO_DEVICEIMPL) << "Cannot read the device info! (unavailable attribute)";
 				continue;
+			}
+
+			const iio_attr *attr = attrRes.data();
+			const char *name = IIOAttribute::get_name(attr);
+			const char *value = IIOAttribute::get_static_value(attr); // FIXME: This should work
 			contextAttributes[name] = value;
 		}
 		ConnectionProvider::GetInstance()->close(m_param);

core/src/iiotabwidget.cpp

@@ -22,10 +22,12 @@
 #include "iiotabwidget.h"
 
 #include "iioutil/scopy-iioutil_config.h"
+#include <iioutil/iiocpp/iioscan.h>
+
 #include "menusectionwidget.h"
 #include "qtconcurrentrun.h"
 
-#include <iio.h>
+// #include <iio.h>
 #include <QLoggingCategory>
 #include <style.h>
 #include <stylehelper.h>
@@ -149,9 +151,9 @@ void IioTabWidget::setupConnections()
 QStringList IioTabWidget::computeBackendsList()
 {
 	QStringList list;
-	int backEndsCount = iio_get_backends_count();
-	for(int i = 0; i < backEndsCount; i++) {
-		QString backEnd(iio_get_backend(i));
+	unsigned int backEndsCount = IIOScan::get_builtin_backends_count();
+	for(unsigned i = 0; i < backEndsCount; i++) {
+		QString backEnd(IIOScan::get_builtin_backend(i));
 		if(backEnd.compare("xml") == 0 || backEnd.compare("serial") == 0) {
 			continue;
 		}
@@ -287,7 +289,7 @@ bool IioTabWidget::isSerialCompatible()
 #ifdef WITH_LIBSERIALPORT
 	hasLibSerialPort = true;
 #endif
-	bool hasSerialBackend = iio_has_backend("serial");
+	bool hasSerialBackend = IIOScan::has_backend(nullptr, "serial");
 	return hasLibSerialPort && hasSerialBackend;
 }
 

gr-util/include/gr-util/griiodevicesource.h

@@ -25,7 +25,7 @@
 #include "grproxyblock.h"
 #include "scopy-gr-util_export.h"
 
-#include <iio.h>
+#include <iio/iio.h>
 
 #include <gnuradio/iio/device_source.h>
 
@@ -40,7 +40,8 @@ class SCOPY_GR_UTIL_EXPORT GRIIOChannel : public GRProxyBlock
 		: GRProxyBlock(parent)
 		, channelName(channelName)
 		, m_dev(dev)
-	{}
+	{
+	}
 	GRIIODeviceSource *getDeviceSrc() { return m_dev; }
 	QString getChannelName() { return channelName; }
 	virtual bool samplerateAttributeAvailable() { return false; }

gr-util/test/tst_grblocks.cpp

@@ -22,6 +22,7 @@
 #include "gr-util/grproxyblock.h"
 #include "gr-util/grsignalpath.h"
 #include "gr-util/grtopblock.h"
+#include <iioutil/iiocpp/iiocontext.h>
 
 #include <gnuradio/blocks/head.h>
 #include <gnuradio/blocks/stream_to_vector.h>
@@ -661,7 +662,7 @@ void TST_GRBlocks::test5()
 	top.registerSignalPath(ch2);
 	ch3 = new GRSignalPath("complex", &top);
 
-	iio_context *ctx = iio_create_context_from_uri("ip:192.168.2.1");
+	iio_context *ctx = scopy::IIOContext::create_context(nullptr, "ip:192.168.2.1");
 	if(!ctx) {
 		QSKIP("No context. Skipping");
 	}

gui/src/deviceinfopage.cpp

@@ -20,6 +20,9 @@
  */
 
 #include "deviceinfopage.h"
+#include <iioutil/iiocpp/iiocontext.h>
+#include <iioutil/iiocpp/iioattribute.h>
+#include <iioutil/iiocpp/iioresult.h>
 #include <QVBoxLayout>
 #include <QDebug>
 
@@ -55,33 +58,36 @@ void DeviceInfoPage::setupInfoPage()
 
 	QString backendName, description;
 	unsigned int major, minor;
-	char git_tag[8] = "0000000";
-	int ret = EXIT_FAILURE;
-	ret = iio_context_get_version(m_conn->context(), &major, &minor, git_tag);
-	if(ret) {
-		qWarning() << "Error, cannot read backend version.";
-		major = 'x';
-		minor = 'x';
-	}
+	const char *versionTag;
+
+	major = IIOContext::get_version_major(m_conn->context());
+	minor = IIOContext::get_version_minor(m_conn->context());
+	versionTag = IIOContext::get_version_tag(m_conn->context());
 
-	backendName = iio_context_get_name(m_conn->context());
-	description = iio_context_get_description(m_conn->context());
+	backendName = IIOContext::get_name(m_conn->context());
+	description = IIOContext::get_description(m_conn->context());
 
 	QString backendText = "IIO context created with %1 backend.\n"
 			      "Backend version: %2.%3 (git tag: %4)\n"
 			      "Backend description string: %5";
 	m_backendInfo->setText(backendText.arg(backendName)
 				       .arg(QString::number(major))
 				       .arg(QString::number(minor))
-				       .arg(git_tag)
+				       .arg(versionTag)
 				       .arg(description));
 
 	const char *name;
 	const char *value;
-	for(int i = 0; i < iio_context_get_attrs_count(m_conn->context()); ++i) {
-		int ret = iio_context_get_attr(m_conn->context(), i, &name, &value);
-		if(ret != 0)
+	for(int i = 0; i < IIOContext::get_attrs_count(m_conn->context()); ++i) {
+		IIOResult<const iio_attr *> res = IIOContext::get_attr(m_conn->context(), i, &name, &value);
+		if(!res.ok()) {
+			qDebug() << "Error getting attribute at index" << i << "error code:" << res.error();
 			continue;
+		}
+
+		// TODO: check that get_static_value_works
+		name = IIOAttribute::get_name(res.data());
+		value = IIOAttribute::get_static_value(res.data());
 
 		m_infoPage->update(name, value);
 	}

iio-widgets/CMakeLists.txt

@@ -74,7 +74,7 @@ endif()
 set(SCOPY_QT_COMPONENTS Core Widgets)
 
 find_library(IIO_LIBRARIES NAMES iio libiio REQUIRED)
-find_path(IIO_INCLUDE_DIRS iio.h REQUIRED)
+find_path(IIO_INCLUDE_DIRS iio/iio.h REQUIRED)
 
 set(PROJECT_SOURCES ${SRC_LIST} ${HEADER_LIST} ${UI_LIST})
 

iio-widgets/include/iio-widgets/datastrategy/channelattrdatastrategy.h

@@ -22,7 +22,6 @@
 #define SCOPY_CHANNELATTRDATASTRATEGY_H
 
 #include <QWidget>
-#include <iio.h>
 #include "datastrategy/datastrategyinterface.h"
 #include "iiowidgetdata.h"
 #include "scopy-iio-widgets_export.h"

iio-widgets/include/iio-widgets/datastrategy/contextattrdatastrategy.h

@@ -23,7 +23,6 @@
 #define SCOPY_CONTEXTATTRDATASTRATEGY_H
 
 #include <QWidget>
-#include <iio.h>
 #include "datastrategyinterface.h"
 #include "scopy-iio-widgets_export.h"