!322 文件系统冗余代码和依赖删除

Merge pull request !322 from 野生毛霉君/master

kernel/base/misc/task_shellcmd.c

@@ -49,7 +49,7 @@
 #include "los_process_pri.h"
 #include "los_vm_dump.h"
 #ifdef LOSCFG_FS_VFS
-#include "fs/fs.h"
+#include "fs/file.h"
 #endif
 #include "los_sched_pri.h"
 

kernel/base/misc/vm_shellcmd.c

@@ -43,7 +43,7 @@
 #include "los_vm_dump.h"
 #include "los_process_pri.h"
 #ifdef LOSCFG_FS_VFS
-#include "fs/path_cache.h"
+#include "path_cache.h"
 #endif
 
 #ifdef LOSCFG_KERNEL_VM

kernel/base/vm/los_vm_dump.c

@@ -37,7 +37,7 @@
 #include "los_vm_dump.h"
 #include "los_mmu_descriptor_v6.h"
 #ifdef LOSCFG_FS_VFS
-#include "fs/fs.h"
+#include "fs/file.h"
 #endif
 #include "los_printf.h"
 #include "los_vm_page.h"

kernel/base/vm/los_vm_filemap.c

@@ -41,6 +41,7 @@
 #include "los_vm_fault.h"
 #include "los_process_pri.h"
 #include "los_vm_lock.h"
+#include "vnode.h"
 
 #ifndef UNUSED
 #define UNUSED(x)          (VOID)x

kernel/base/vm/los_vm_map.c

@@ -41,7 +41,7 @@
 #include "los_arch_mmu.h"
 #include "los_process_pri.h"
 #ifdef LOSCFG_FS_VFS
-#include "fs/fs.h"
+#include "fs/file.h"
 #endif
 #include "los_task.h"
 #include "los_memory_pri.h"

kernel/common/Makefile

@@ -34,7 +34,7 @@ MODULE_NAME := rootfs
 LOCAL_SRCS := $(wildcard los_rootfs.c)
 
 LOCAL_INCLUDE := \
-	-I $(LITEOSTOPDIR)/kernel/common \
+    -I $(LITEOSTOPDIR)/kernel/common \
 
 ifeq ($(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7), y)
 LOCAL_INCLUDE += -I $(LITEOSTOPDIR)/../../device/qemu/arm_virt/config/cfiflash

kernel/common/console.c

@@ -47,10 +47,8 @@
 #include "los_exc_pri.h"
 #include "los_process_pri.h"
 #include "los_sched_pri.h"
-#include "fs/path_cache.h"
-#include "fs/vfs_util.h"
 #include "user_copy.h"
-#include "fs/vnode.h"
+#include "fs/driver.h"
 
 #define EACH_CHAR 1
 #define UART_IOC_MAGIC   'u'

kernel/common/los_excinfo.c

@@ -31,9 +31,6 @@
 
 #include "los_base.h"
 #include "los_hwi.h"
-#ifdef LOSCFG_FS_VFS
-#include "fs/fs.h"
-#endif
 #ifdef LOSCFG_SHELL
 #include "shcmd.h"
 #endif

kernel/common/los_hilog.c

@@ -35,7 +35,8 @@
 #include "los_mux.h"
 #include "los_process_pri.h"
 #include "los_task_pri.h"
-#include "fs/fs.h"
+#include "fs/file.h"
+#include "fs/driver.h"
 #include "los_vm_map.h"
 #include "los_vm_lock.h"
 #include "user_copy.h"

kernel/common/los_rootfs.c

@@ -42,7 +42,7 @@
 #include "los_rootfs.h"
 #endif
 #include "mtd_list.h"
-#include "fs/path_cache.h"
+#include "fs/driver.h"
 
 #ifdef LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7
 #include "mtd_partition.h"

kernel/common/patchfs/los_patchfs.c

@@ -32,7 +32,7 @@
 #include "los_partition_utils.h"
 
 #include "sys/mount.h"
-#include "fs/vnode.h"
+#include "vnode.h"
 
 #ifdef LOSCFG_PLATFORM_PATCHFS
 

kernel/common/virtual_serial.c

@@ -36,11 +36,9 @@
 #endif
 #ifdef LOSCFG_FS_VFS
 #include "console.h"
+#include "fs/driver.h"
 #endif
 
-#include "fs/path_cache.h"
-
-
 STATIC volatile UINT32 g_serialType = 0;
 STATIC struct file g_serialFilep;
 

kernel/common/virtual_serial.h

@@ -33,9 +33,7 @@
 #define _VIRTUAL_SERIAL_H
 
 #include "los_config.h"
-#ifdef LOSCFG_FS_VFS
-#include "fs/fs.h"
-#endif
+#include "fs/file.h"
 #if defined(LOSCFG_DRIVERS_USB_SERIAL_GADGET) || defined(LOSCFG_DRIVERS_USB_ETH_SER_GADGET)
 #include "implementation/usb_api_pri.h"
 #endif

kernel/extended/dynload/include/los_load_elf.h

@@ -45,7 +45,7 @@
 #ifdef LOSCFG_DRIVERS_TZDRIVER
 #include "fs/file.h"
 #endif
-#include "fs/fs.h"
+#include "fs/file.h"
 #include "unistd.h"
 
 #ifdef __cplusplus

kernel/extended/dynload/src/los_load_elf.c

@@ -32,7 +32,7 @@
 #include "los_load_elf.h"
 #include "fcntl.h"
 #include "fs/fd_table.h"
-#include "fs_file.h"
+#include "fs/file.h"
 #include "los_config.h"
 #include "los_vm_map.h"
 #include "los_vm_syscall.h"

kernel/extended/liteipc/hm_liteipc.c

@@ -31,8 +31,8 @@
 
 #include "hm_liteipc.h"
 #include "linux/kernel.h"
-#include "fs/fs.h"
-#include "fs_file.h"
+#include "fs/file.h"
+#include "fs/driver.h"
 #include "los_init.h"
 #include "los_mp.h"
 #include "los_mux.h"

kernel/include/los_toolchain.h

@@ -47,6 +47,13 @@ extern "C" {
 #endif /* __cplusplus */
 #endif /* __cplusplus */
 
+#ifndef UNUSED
+#define UNUSED(var)    \
+        do {           \
+            (void)var; \
+        } while (0)
+#endif
+
 /* for ARM Compiler */
 #if defined ( __CC_ARM )
 #ifndef ASM