From 06ac514a09a0284d4156fdc4f0ee9a526417f3a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?William=20B=C3=A9rub=C3=A9?= <wberube@null.net>
Date: Wed, 19 Jun 2024 15:31:25 -0400
Subject: [PATCH] Audio init adjustments

---
 src/hal/hisi/v3_hal.c  |  8 +++++---
 src/hal/hisi/v4_hal.c  |  8 +++++---
 src/hal/star/i6_hal.c  | 12 +++++++-----
 src/hal/star/i6c_aud.h | 10 +++++-----
 src/hal/star/i6c_hal.c | 20 +++++++++++---------
 src/hal/star/i6f_hal.c | 12 +++++++-----
 6 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/src/hal/hisi/v3_hal.c b/src/hal/hisi/v3_hal.c
index a570194..41521dc 100644
--- a/src/hal/hisi/v3_hal.c
+++ b/src/hal/hisi/v3_hal.c
@@ -107,9 +107,11 @@ void *v3_audio_thread(void)
     v3_aud_efrm echoFrame;
 
     while (keepRunning) {
-        ret = v3_aud.fnGetFrame(_v3_aud_dev, _v3_aud_chn, 
-            &frame, &echoFrame, 100);
-        if (ret && ret != 0xA015800E) {
+        memset(&frame, 0, sizeof(frame));
+        memset(&echoFrame, 0, sizeof(echoFrame));
+        
+        if (ret = v3_aud.fnGetFrame(_v3_aud_dev, _v3_aud_chn, 
+            &frame, &echoFrame, 100)) {
             fprintf(stderr, "[v3_aud] Getting the frame failed "
                 "with %#x!\n", ret);
             break;
diff --git a/src/hal/hisi/v4_hal.c b/src/hal/hisi/v4_hal.c
index d2b666a..600d1aa 100644
--- a/src/hal/hisi/v4_hal.c
+++ b/src/hal/hisi/v4_hal.c
@@ -108,9 +108,11 @@ void *v4_audio_thread(void)
     v4_aud_efrm echoFrame;
 
     while (keepRunning) {
-        ret = v4_aud.fnGetFrame(_v4_aud_dev, _v4_aud_chn, 
-            &frame, &echoFrame, 100);
-        if (ret && ret != 0xA015800E) {
+        memset(&frame, 0, sizeof(frame));
+        memset(&echoFrame, 0, sizeof(echoFrame));
+
+        if (ret = v4_aud.fnGetFrame(_v4_aud_dev, _v4_aud_chn, 
+            &frame, &echoFrame, 100)) {
             fprintf(stderr, "[v4_aud] Getting the frame failed "
                 "with %#x!\n", ret);
             break;
diff --git a/src/hal/star/i6_hal.c b/src/hal/star/i6_hal.c
index 8401399..97b43f1 100644
--- a/src/hal/star/i6_hal.c
+++ b/src/hal/star/i6_hal.c
@@ -112,13 +112,15 @@ void *i6_audio_thread(void)
     i6_aud_efrm echoFrame;
 
     while (keepRunning) {
-        ret = i6_aud.fnGetFrame(_i6_aud_dev, _i6_aud_chn, 
-            &frame, &echoFrame, 100);
-        if (ret && ret != 0xA004200E) {
+        memset(&frame, 0, sizeof(frame));
+        memset(&echoFrame, 0, sizeof(echoFrame));
+        
+        if (ret = i6_aud.fnGetFrame(_i6_aud_dev, _i6_aud_chn, 
+            &frame, &echoFrame, 100)) {
             fprintf(stderr, "[i6_aud] Getting the frame failed "
                 "with %#x!\n", ret);
-            break;
-        } else continue;
+            continue;
+        }
 
         if (i6_aud_cb) {
             hal_audframe outFrame;
diff --git a/src/hal/star/i6c_aud.h b/src/hal/star/i6c_aud.h
index d9f7983..8aa4e2f 100644
--- a/src/hal/star/i6c_aud.h
+++ b/src/hal/star/i6c_aud.h
@@ -81,11 +81,11 @@ typedef enum {
 } i6c_aud_input;
 
 typedef enum {
-    I6C_AUD_SND_MONO,
-    I6C_AUD_SND_STEREO,
-    I6C_AUD_SND_4CH,
-    I6C_AUD_SND_6CH,
-    I6C_AEND_SND_8CH,
+    I6C_AUD_SND_MONO   = 1,
+    I6C_AUD_SND_STEREO = 2,
+    I6C_AUD_SND_4CH    = 4,
+    I6C_AUD_SND_6CH    = 6,
+    I6C_AUD_SND_8CH    = 8,
     I6C_AUD_SND_END
 } i6c_aud_snd;
 
diff --git a/src/hal/star/i6c_hal.c b/src/hal/star/i6c_hal.c
index 3908e85..97df68b 100644
--- a/src/hal/star/i6c_hal.c
+++ b/src/hal/star/i6c_hal.c
@@ -90,7 +90,7 @@ int i6c_audio_init(void)
             return ret;
     }
     {
-        i6c_aud_input input = I6C_AUD_INPUT_I2S_A_01;
+        i6c_aud_input input[] = { I6C_AUD_INPUT_I2S_A_01 };
         i6c_aud_i2s config;
         config.intf = I6C_AUD_INTF_I2S_SLAVE;
         config.bit = I6C_AUD_BIT_16;
@@ -99,15 +99,15 @@ int i6c_audio_init(void)
         config.clock = I6C_AUD_CLK_OFF;
         config.syncRxClkOn = 1;
         config.tdmSlotNum = 1;
-        if (ret = i6c_aud.fnSetI2SConfig(input, &config))
+        if (ret = i6c_aud.fnSetI2SConfig(input[0], &config))
             return ret;
-        if (ret = i6c_aud.fnAttachToDevice(_i6c_aud_dev, &input, 1))
+        if (ret = i6c_aud.fnAttachToDevice(_i6c_aud_dev, input, 1))
             return ret;
     }
 
     {
         char gain[1] = { 0xF6 };
-        if (ret = i6c_aud.fnSetGain(_i6c_aud_dev, _i6c_aud_chn, (char*)&gain, 1))
+        if (ret = i6c_aud.fnSetGain(_i6c_aud_dev, _i6c_aud_chn, gain, 1))
             return ret;
     }
     if (ret = i6c_aud.fnEnableGroup(_i6c_aud_dev, _i6c_aud_chn))
@@ -123,13 +123,15 @@ void *i6c_audio_thread(void)
     i6c_aud_frm frame, echoFrame;
 
     while (keepRunning) {
-        ret = i6c_aud.fnGetFrame(_i6c_aud_dev, _i6c_aud_chn, 
-            &frame, &echoFrame, 100);
-        if (ret && ret != 0xA004200E) {
+        memset(&frame, 0, sizeof(frame));
+        memset(&echoFrame, 0, sizeof(echoFrame));
+        
+        if (ret = i6c_aud.fnGetFrame(_i6c_aud_dev, _i6c_aud_chn, 
+            &frame, &echoFrame, 100)) {
             fprintf(stderr, "[i6c_aud] Getting the frame failed "
                 "with %#x!\n", ret);
-            break;
-        } else continue;
+            continue;
+        }
 
         if (i6c_aud_cb) {
             hal_audframe outFrame;
diff --git a/src/hal/star/i6f_hal.c b/src/hal/star/i6f_hal.c
index 8037423..eb3e22a 100644
--- a/src/hal/star/i6f_hal.c
+++ b/src/hal/star/i6f_hal.c
@@ -115,13 +115,15 @@ void *i6f_audio_thread(void)
     i6f_aud_efrm echoFrame;
 
     while (keepRunning) {
-        ret = i6f_aud.fnGetFrame(_i6f_aud_dev, _i6f_aud_chn, 
-            &frame, &echoFrame, 100);
-        if (ret && ret == 0xA004200E) {
+        memset(&frame, 0, sizeof(frame));
+        memset(&echoFrame, 0, sizeof(echoFrame));
+        
+        if (ret = i6f_aud.fnGetFrame(_i6f_aud_dev, _i6f_aud_chn, 
+            &frame, &echoFrame, 100)) {
             fprintf(stderr, "[i6f_aud] Getting the frame failed "
                 "with %#x!\n", ret);
-            break;
-        } else continue;
+            continue;
+        }
 
         if (i6f_aud_cb) {
             hal_audframe outFrame;