修改API框架，兼容1806
Change-Id: Ic68e966a32e4c7ffd7137b3d7ba94e4d813c71b2
diff --git a/mbtk/lynq_lib/src/lynq_audio.c b/mbtk/lynq_lib/src/lynq_audio.c
index 21640ac..f783f5f 100755
--- a/mbtk/lynq_lib/src/lynq_audio.c
+++ b/mbtk/lynq_lib/src/lynq_audio.c
@@ -29,6 +29,9 @@
#include "mbtk_log.h"
#include "mbtk_type.h"
+
+#ifdef MBTK_PLATFORM_ASR1803
+
#include "mbtk_audio.h"
static int rec_fd = 0;
@@ -164,9 +167,13 @@
}
}
}
+#else
+
+#endif
int lynq_media_rec_audio(const char *path)
{
+#ifdef MBTK_PLATFORM_ASR1803
int ret = 0;
char audio_dir[50] ={0};
char audio_wav[10] = {0};
@@ -205,6 +212,10 @@
}
return -1;
+#else
+
+ return -1;
+#endif
}
@@ -212,6 +223,7 @@
//停止录制音频文件
void lynq_media_rec_stop_audio(void)
{
+#ifdef MBTK_PLATFORM_ASR1803
// sleep(10);
mbtk_audio_close(record_hdl);
if(rec_fd > 0)
@@ -219,9 +231,12 @@
close(rec_fd);
rec_fd = 0;
}
- return 0;
+#else
+
+#endif
}
+#ifdef MBTK_PLATFORM_ASR1803
//播放音频文件
int lynq_media_play_audio_thread_handle(void *argv)
{
@@ -260,10 +275,12 @@
mbtk_audio_close(play_hdl);
return 0;
}
+#endif
//创建线程播放音频文件
int lynq_media_play_audio(const char *path)
{
+#ifdef MBTK_PLATFORM_ASR1803
int ret = pthread_create(&paly_thread, NULL, lynq_media_play_audio_thread_handle, (void *)path);
if (ret != 0) {
printf("create thread failed!\n");
@@ -272,12 +289,17 @@
pthread_detach(paly_thread);
return 0;
+#else
+
+ return 0;
+#endif
}
//停止播放音频文件
void lynq_media_stop_audio(void)
{
+#ifdef MBTK_PLATFORM_ASR1803
printf("lynq_media_stop_audio()----\n");
if(play_fd > 0)
{
@@ -290,9 +312,12 @@
play_fd = 0;
}
mbtk_audio_close(play_hdl);
+#else
+
+#endif
}
-
+#ifdef MBTK_PLATFORM_ASR1803
int lynq_audio_ubus_client_init(mbtk_audio_client_handle_type *ph_audio, mbtk_dtmf_cb cb)
{
if(rec_fd > 0 || play_fd > 0)
@@ -312,22 +337,27 @@
}
return mbtk_audio_ubus_client_deinit(h_audio);
}
-
+#endif
int lynq_get_spk_volume(int * volume)
{
+#ifdef MBTK_PLATFORM_ASR1803
mbtk_audio_ubus_volume_get(audio_volume_cb);
*volume = volume_size;
return 0;
+#else
+ return 0;
+#endif
}
int lynq_set_spk_volume(const int volume)
{
+#ifdef MBTK_PLATFORM_ASR1803
mbtk_audio_ubus_volume_set(volume);
return 0;
+#else
+ return 0;
+#endif
}
-
-
-
diff --git a/mbtk/lynq_lib/src/lynq_call_api.c b/mbtk/lynq_lib/src/lynq_call_api.c
index 1645803..ccab09f 100755
--- a/mbtk/lynq_lib/src/lynq_call_api.c
+++ b/mbtk/lynq_lib/src/lynq_call_api.c
@@ -3,7 +3,9 @@
static mbtk_info_handle_t* info_handle = NULL;
int lynq_volume_size = 0;
+#ifdef MBTK_PLATFORM_ASR1803
mbtk_audio_client_handle_type lynq_dtmf_handle;
+#endif
mbtk_call_info_t lynq_reg[5]={0};
int *handle_ptr=null;
void (*incoming_call_cb_p)(int x)=NULL;
@@ -101,16 +103,19 @@
*/
}
-
+#ifdef MBTK_PLATFORM_ASR1803
void lynq_dtmf_cb(char dtmf)
{
printf("%s:%c\n", __FUNCTION__, dtmf);
}
+#endif
int lynq_init_call(int uToken)
{
UNUSED(uToken);
+#ifdef MBTK_PLATFORM_ASR1803
mbtk_audio_ubus_client_init(&lynq_dtmf_handle, lynq_dtmf_cb);
+#endif
if(info_handle == NULL)
{
info_handle = mbtk_info_handle_get();
@@ -400,6 +405,8 @@
}
+
+#ifdef MBTK_PLATFORM_ASR1803
void lynq_audio_volume_cb(int volume)
{
lynq_volume_size = volume;
@@ -413,9 +420,12 @@
printf("%s:%d\n", __FUNCTION__, lynq_volume_size);
}
}
+#endif
int lynq_set_speech_volume(const int volume)
{
+
+#ifdef MBTK_PLATFORM_ASR1803
if(volume <= 0 || volume >= 101)
{
printf("input error\n");
@@ -428,12 +438,21 @@
mbtk_audio_ubus_volume_set(set_volume);
return 0;
}
+#else
+
+ return 0;
+#endif
}
int lynq_get_speech_volume(int * volume)
{
+#ifdef MBTK_PLATFORM_ASR1803
mbtk_audio_ubus_volume_get(lynq_audio_volume_cb);
sleep(1);
*volume = lynq_volume_size;
return 0;
+#else
+
+ return 0;
+#endif
}
\ No newline at end of file
diff --git a/mbtk/lynq_lib/src/lynq_gnss.c b/mbtk/lynq_lib/src/lynq_gnss.c
index b746c31..19c2d42 100755
--- a/mbtk/lynq_lib/src/lynq_gnss.c
+++ b/mbtk/lynq_lib/src/lynq_gnss.c
@@ -23,13 +23,21 @@
#include <termios.h>
#include <sys/ioctl.h>
#include "mbtk_type.h"
-#include "mbtk_gnss.h"
#include "lynq/lynq_gnss.h"
+#ifdef MBTK_GNSS_6228
+#include "mbtk_gnss_6228.h"
+
static mbtk_gnss_client_handle _gnss_handle = 0;
+#else
+
+#endif
+
+
static lynq_gnss_rx_ind_msg_handler_t handler_ptr = NULL;
+#ifdef MBTK_GNSS_6228
void lynq_gnss_handler_function
(
mbtk_gnss_client_handle h_loc,
@@ -149,3 +157,56 @@
mbtk_gnss_firmware_update();
return 0;
}
+#else
+//该函数用于进行GNSS初始化
+int lynq_gnss_init(void)
+{
+
+ return 0;
+}
+
+//该函数用于取消GNSS初始化
+int lynq_gnss_deinit(void)
+{
+
+ return 0;
+}
+
+//该函数用于GNSS回调函数初始化
+
+int lynq_gnss_callback_reg(lynq_gnss_rx_ind_msg_handler_t handlerPtr)
+{
+ UNUSED(handlerPtr);
+
+
+ return 0;
+}
+
+//该函数用于启动GNSS。
+int lynq_gnss_start(void)
+{
+ return 0;
+}
+
+//该函数用于关闭GNSS。
+int lynq_gnss_stop(void)
+{
+ return 0;
+}
+
+
+int lynq_gnss_agps_dataconnopen(void)
+{
+ return 0;
+}
+
+int lynq_gnss_dev_reset(void)
+{
+ return 0;
+}
+
+int lynq_gnss_enable_glonass(void)
+{
+ return 0;
+}
+#endif
\ No newline at end of file