From 631bc6c49cf6147a4fc354088c8495641db24adc Mon Sep 17 00:00:00 2001
From: Neil Chen <jingsi.chen@petalmail.com>
Date: Sat, 25 Jun 2022 22:40:40 +0800
Subject: [PATCH] fix build warnings

1. implicit declaration of function 'OsalMemFree', 'HalIrqEnable', 'LOS_MuxCreate', 'strlen', 'malloc', 'free'
2. unused variable 'fbmem'
3. type of 'VOID' defaults to 'int'
4. no return statement in function returning non-void
5. return makes pointer from integer without a cast

Signed-off-by: Neil Chen <jingsi.chen@petalmail.com>
---
 riscv32_virt/liteos_m/board/driver/uart.c                    | 1 +
 riscv32_virt/liteos_m/board/driver/video/fb.c                | 1 -
 riscv32_virt/liteos_m/board/driver/video/fb_mem.h            | 2 ++
 riscv32_virt/liteos_m/board/driver/virtinput.c               | 5 +++--
 .../liteos_m/board/hardware/adapter/hdf_syscall_adapter.c    | 1 +
 riscv32_virt/liteos_m/board/test/test_demo.c                 | 5 ++---
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/riscv32_virt/liteos_m/board/driver/uart.c b/riscv32_virt/liteos_m/board/driver/uart.c
index cd411f6..0fcc796 100644
--- a/riscv32_virt/liteos_m/board/driver/uart.c
+++ b/riscv32_virt/liteos_m/board/driver/uart.c
@@ -17,6 +17,7 @@
 
 #include "los_arch_interrupt.h"
 #include "los_interrupt.h"
+#include "riscv_hal.h"
 
 #ifdef __cplusplus
 #if __cplusplus
diff --git a/riscv32_virt/liteos_m/board/driver/video/fb.c b/riscv32_virt/liteos_m/board/driver/video/fb.c
index e2b1086..0b57e63 100644
--- a/riscv32_virt/liteos_m/board/driver/video/fb.c
+++ b/riscv32_virt/liteos_m/board/driver/video/fb.c
@@ -139,7 +139,6 @@ int fb_ioctl(struct fb_mem *fbMem, int cmd, unsigned long arg)
         case FIOC_MMAP:
             { /* Get color plane info */
                 void **ppv = (void **)((uintptr_t)arg);
-                uintptr_t fbmem = (uintptr_t)fb->fbmem;
                 /* Return the address corresponding to the start of frame buffer. */
                 DEBUGASSERT(ppv != NULL);
                 *ppv = fb->fbmem;
diff --git a/riscv32_virt/liteos_m/board/driver/video/fb_mem.h b/riscv32_virt/liteos_m/board/driver/video/fb_mem.h
index 92b46ca..cdf753e 100644
--- a/riscv32_virt/liteos_m/board/driver/video/fb_mem.h
+++ b/riscv32_virt/liteos_m/board/driver/video/fb_mem.h
@@ -32,6 +32,7 @@
 #define _FBMEM_H
 
 #include <stdint.h>
+#include <stdlib.h>
 #include "sys/types.h"
 #include "sys/stat.h"
 #ifdef LOSCFG_LIBC_NEWLIB
@@ -43,6 +44,7 @@
 #include "los_interrupt.h"
 #include "los_debug.h"
 #include "los_task.h"
+#include "los_mux.h"
 
 #define PATH_MAX 256
 #define V_CREATE     (1 << 0)
diff --git a/riscv32_virt/liteos_m/board/driver/virtinput.c b/riscv32_virt/liteos_m/board/driver/virtinput.c
index 18e82c2..2f5abb6 100644
--- a/riscv32_virt/liteos_m/board/driver/virtinput.c
+++ b/riscv32_virt/liteos_m/board/driver/virtinput.c
@@ -366,13 +366,14 @@ static int32_t InputWorkTask(void *arg)
 {
     struct Virtin *in = (struct Virtin *)arg;
 
-    while(1) {
+    while (1) {
         int32_t r = osSemaphoreAcquire(in->sem, osWaitForever);
         if (r != 0) {
             continue;
         }
         VirtinHandleEv(in);
     }
+    return HDF_FAILURE;
 }
 
 static int32_t HdfVirtinInit(struct HdfDeviceObject *device)
@@ -449,5 +450,5 @@ struct HdfDeviceObject *GetHdfDeviceObject(void)
     if(g_virtInputDev != NULL){
         return g_virtInputDev->hdfDevObj;
     }
-    return HDF_FAILURE;
+    return NULL;
 }
diff --git a/riscv32_virt/liteos_m/board/hardware/adapter/hdf_syscall_adapter.c b/riscv32_virt/liteos_m/board/hardware/adapter/hdf_syscall_adapter.c
index f63104b..9da7a84 100644
--- a/riscv32_virt/liteos_m/board/hardware/adapter/hdf_syscall_adapter.c
+++ b/riscv32_virt/liteos_m/board/hardware/adapter/hdf_syscall_adapter.c
@@ -16,6 +16,7 @@
 #include "hdf_syscall_adapter.h"
 #include "hdf_log.h"
 #include "hdf_sbuf.h"
+#include "osal_mem.h"
 #include "devsvc_manager_clnt.h"
 
 #define HDF_LOG_TAG hdf_syscall_adapter
diff --git a/riscv32_virt/liteos_m/board/test/test_demo.c b/riscv32_virt/liteos_m/board/test/test_demo.c
index 8d5ac03..95799df 100644
--- a/riscv32_virt/liteos_m/board/test/test_demo.c
+++ b/riscv32_virt/liteos_m/board/test/test_demo.c
@@ -29,8 +29,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-unsigned int LosAppInit(VOID)
+unsigned int LosAppInit(void)
 {
-    unsigned int ret = 0;
-    return ret;
+    return 0;
 }
\ No newline at end of file
-- 
Gitee