MLECO-3096: Removing data_acq and data_psn

Further to the HAL refactoring done in previous commits,
this CR simpifies HAL by removing data_acq and data_psn
"modules". The associated function pointers have been
removed.

Change-Id: I04c194c08dfe0aff98ce4e0f0f056bac254c137d
Signed-off-by: Kshitij Sisodia <kshitij.sisodia@arm.com>

6 files changed, 14 insertions, 42 deletions

diff --git a/tests/common/ProfilerTests.cc b/tests/common/ProfilerTests.cc
index 1435dde..889e2f2 100644
--- a/tests/common/ProfilerTests.cc
+++ b/tests/common/ProfilerTests.cc
@@ -26,12 +26,10 @@
 TEST_CASE("Common: Test Profiler")
 {
     hal_platform    platform;
-    data_acq_module data_acq {};
-    data_psn_module data_psn {};
     platform_timer  timer {};
 
     /* Initialise the HAL and platform. */
-    hal_init(&platform, &data_acq, &data_psn, &timer);
+    hal_init(&platform, &timer);
     hal_platform_init(&platform);
 
     /* An invalid profiler shouldn't be of much use */
diff --git a/tests/use_case/img_class/ImgClassificationUCTest.cc b/tests/use_case/img_class/ImgClassificationUCTest.cc
index b989415..62d8eb8 100644
--- a/tests/use_case/img_class/ImgClassificationUCTest.cc
+++ b/tests/use_case/img_class/ImgClassificationUCTest.cc
@@ -44,12 +44,10 @@ TEST_CASE("Model info")
 TEST_CASE("Inference by index", "[.]")
 {
     hal_platform    platform;
-    data_acq_module data_acq;
-    data_psn_module data_psn;
     platform_timer  timer;
 
     /* Initialise the HAL and platform. */
-    hal_init(&platform, &data_acq, &data_psn, &timer);
+    hal_init(&platform, &timer);
     hal_platform_init(&platform);
 
     /* Model wrapper object. */
@@ -84,12 +82,10 @@ TEST_CASE("Inference by index", "[.]")
 TEST_CASE("Inference run all images", "[.]")
 {
     hal_platform    platform;
-    data_acq_module data_acq;
-    data_psn_module data_psn;
     platform_timer  timer;
 
     /* Initialise the HAL and platform. */
-    hal_init(&platform, &data_acq, &data_psn, &timer);
+    hal_init(&platform, &timer);
     hal_platform_init(&platform);
 
     /* Model wrapper object. */
@@ -120,12 +116,10 @@ TEST_CASE("Inference run all images", "[.]")
 TEST_CASE("List all images")
 {
     hal_platform    platform;
-    data_acq_module data_acq;
-    data_psn_module data_psn;
     platform_timer  timer;
 
     /* Initialise the HAL and platform. */
-    hal_init(&platform, &data_acq, &data_psn, &timer);
+    hal_init(&platform, &timer);
     hal_platform_init(&platform);
 
     /* Model wrapper object. */
diff --git a/tests/use_case/kws/KWSHandlerTest.cc b/tests/use_case/kws/KWSHandlerTest.cc
index a7e75fb..3013611 100644
--- a/tests/use_case/kws/KWSHandlerTest.cc
+++ b/tests/use_case/kws/KWSHandlerTest.cc
@@ -44,12 +44,10 @@ TEST_CASE("Model info")
 TEST_CASE("Inference by index")
 {
     hal_platform    platform;
-    data_acq_module data_acq;
-    data_psn_module data_psn;
     platform_timer  timer;
 
     /* Initialise the HAL and platform. */
-    hal_init(&platform, &data_acq, &data_psn, &timer);
+    hal_init(&platform, &timer);
     hal_platform_init(&platform);
 
     /* Model wrapper object. */
@@ -123,12 +121,10 @@ TEST_CASE("Inference by index")
 TEST_CASE("Inference run all clips")
 {
     hal_platform    platform;
-    data_acq_module data_acq;
-    data_psn_module data_psn;
     platform_timer  timer;
 
     /* Initialise the HAL and platform. */
-    hal_init(&platform, &data_acq, &data_psn, &timer);
+    hal_init(&platform, &timer);
     hal_platform_init(&platform);
 
     /* Model wrapper object. */
@@ -161,12 +157,10 @@ TEST_CASE("Inference run all clips")
 TEST_CASE("List all audio clips")
 {
     hal_platform    platform;
-    data_acq_module data_acq;
-    data_psn_module data_psn;
     platform_timer  timer;
 
     /* Initialise the HAL and platform. */
-    hal_init(&platform, &data_acq, &data_psn, &timer);
+    hal_init(&platform, &timer);
     hal_platform_init(&platform);
 
     /* Model wrapper object. */
diff --git a/tests/use_case/noise_reduction/RNNNoiseUCTests.cc b/tests/use_case/noise_reduction/RNNNoiseUCTests.cc
index c2b7ffb..a376dd5 100644
--- a/tests/use_case/noise_reduction/RNNNoiseUCTests.cc
+++ b/tests/use_case/noise_reduction/RNNNoiseUCTests.cc
@@ -26,10 +26,8 @@
 
 #define PLATFORM \
 hal_platform    platform; \
-data_acq_module data_acq; \
-data_psn_module data_psn; \
 platform_timer  timer;    \
-hal_init(&platform, &data_acq, &data_psn, &timer); \
+hal_init(&platform, &timer); \
 hal_platform_init(&platform);
 
 #define CONTEXT \
diff --git a/tests/use_case/object_detection/ObjectDetectionUCTest.cc b/tests/use_case/object_detection/ObjectDetectionUCTest.cc
index 2e63f36..79e76bd 100644
--- a/tests/use_case/object_detection/ObjectDetectionUCTest.cc
+++ b/tests/use_case/object_detection/ObjectDetectionUCTest.cc
@@ -43,12 +43,10 @@ TEST_CASE("Model info")
 TEST_CASE("Inference by index")
 {
     hal_platform    platform;
-    data_acq_module data_acq;
-    data_psn_module data_psn;
     platform_timer  timer;
 
     /* Initialise the HAL and platform. */
-    hal_init(&platform, &data_acq, &data_psn, &timer);
+    hal_init(&platform, &timer);
     hal_platform_init(&platform);
 
     /* Model wrapper object. */
@@ -75,12 +73,10 @@ TEST_CASE("Inference by index")
 TEST_CASE("Inference run all images")
 {
     hal_platform    platform;
-    data_acq_module data_acq;
-    data_psn_module data_psn;
     platform_timer  timer;
 
     /* Initialise the HAL and platform. */
-    hal_init(&platform, &data_acq, &data_psn, &timer);
+    hal_init(&platform, &timer);
     hal_platform_init(&platform);
 
     /* Model wrapper object. */
@@ -107,12 +103,10 @@ TEST_CASE("Inference run all images")
 TEST_CASE("List all images")
 {
     hal_platform    platform;
-    data_acq_module data_acq;
-    data_psn_module data_psn;
     platform_timer  timer;
 
     /* Initialise the HAL and platform. */
-    hal_init(&platform, &data_acq, &data_psn, &timer);
+    hal_init(&platform, &timer);
     hal_platform_init(&platform);
 
     /* Model wrapper object. */
diff --git a/tests/use_case/vww/VisualWakeWordUCTests.cc b/tests/use_case/vww/VisualWakeWordUCTests.cc
index 700a6bb..16bd5a6 100644
--- a/tests/use_case/vww/VisualWakeWordUCTests.cc
+++ b/tests/use_case/vww/VisualWakeWordUCTests.cc
@@ -42,12 +42,10 @@ TEST_CASE("Model info")
 TEST_CASE("Inference by index")
 {
     hal_platform    platform;
-    data_acq_module data_acq;
-    data_psn_module data_psn;
     platform_timer  timer;
 
     /* Initialise the HAL and platform */
-    hal_init(&platform, &data_acq, &data_psn, &timer);
+    hal_init(&platform, &timer);
     hal_platform_init(&platform);
 
     arm::app::VisualWakeWordModel model;    /* model wrapper object */
@@ -79,12 +77,10 @@ TEST_CASE("Inference by index")
 TEST_CASE("Inference run all images")
 {
     hal_platform    platform;
-    data_acq_module data_acq;
-    data_psn_module data_psn;
     platform_timer  timer;
 
     /* Initialise the HAL and platform */
-    hal_init(&platform, &data_acq, &data_psn, &timer);
+    hal_init(&platform, &timer);
     hal_platform_init(&platform);
 
     arm::app::VisualWakeWordModel model;    /* model wrapper object */
@@ -112,12 +108,10 @@ TEST_CASE("Inference run all images")
 TEST_CASE("List all images")
 {
     hal_platform    platform;
-    data_acq_module data_acq;
-    data_psn_module data_psn;
     platform_timer  timer;
 
     /* Initialise the HAL and platform */
-    hal_init(&platform, &data_acq, &data_psn, &timer);
+    hal_init(&platform, &timer);
     hal_platform_init(&platform);
 
     arm::app::VisualWakeWordModel model;    /* model wrapper object */