diff --git a/adapter/khdf/linux/manager/src/devmgr_load.c b/adapter/khdf/linux/manager/src/devmgr_load.c
index 5119e865065594ee58778b817e7fd18f5799f0d6..0822c3e4a664dab5b25c089b846bdcb2da607178 100644
--- a/adapter/khdf/linux/manager/src/devmgr_load.c
+++ b/adapter/khdf/linux/manager/src/devmgr_load.c
@@ -20,7 +20,7 @@
 #include <linux/platform_device.h>
 #include <linux/of_device.h>
 #include "devmgr_service_start.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 static int __init DeviceManagerInit(void)
 {
diff --git a/adapter/khdf/linux/manager/src/devmgr_pm_reg.c b/adapter/khdf/linux/manager/src/devmgr_pm_reg.c
index a8a67a1d0d00af7f1a0b4a677a139395ee4ca0e3..902b5454c690d98accbf8b096f25bcf6df02c6d1 100644
--- a/adapter/khdf/linux/manager/src/devmgr_pm_reg.c
+++ b/adapter/khdf/linux/manager/src/devmgr_pm_reg.c
@@ -21,7 +21,7 @@
 
 #include "devmgr_service.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG devmgr_pm
 
diff --git a/adapter/khdf/linux/manager/src/hdf_kevent.c b/adapter/khdf/linux/manager/src/hdf_kevent.c
index 9199a067d5758967a6cc52508976322c667a4a89..3eb95377d94acb9f5312f49fcb1328c6c3de64ce 100644
--- a/adapter/khdf/linux/manager/src/hdf_kevent.c
+++ b/adapter/khdf/linux/manager/src/hdf_kevent.c
@@ -25,7 +25,7 @@
 #include "devmgr_service_clnt.h"
 #include "hdf_device_desc.h"
 #include "hdf_dlist.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_power_state.h"
 #include "hdf_sbuf.h"
 #include "osal_mem.h"
diff --git a/adapter/khdf/linux/model/camera/src/sg_dma.c b/adapter/khdf/linux/model/camera/src/sg_dma.c
index 80303e8725e96b7a940e4d9de9da9f2837322499..49ff148b85f9e8405214845a6c7cec28048a6b4a 100644
--- a/adapter/khdf/linux/model/camera/src/sg_dma.c
+++ b/adapter/khdf/linux/model/camera/src/sg_dma.c
@@ -7,7 +7,7 @@
  */
 
 #include <securec.h>
-#include <hdf_log.h>
+#include "hdf_core_log.h"
 #include <osal_mem.h>
 #include "sg_dma.h"
 
diff --git a/adapter/khdf/linux/model/camera/src/virtual_malloc.c b/adapter/khdf/linux/model/camera/src/virtual_malloc.c
index e33e3e0a753b7a6b629da4c1685e156ad842651e..7f0a2749bd4e8e0fc727e119f6f32802b1f42189 100644
--- a/adapter/khdf/linux/model/camera/src/virtual_malloc.c
+++ b/adapter/khdf/linux/model/camera/src/virtual_malloc.c
@@ -6,7 +6,7 @@
  * See the LICENSE file in the root of this repository for complete details.
  */
 
-#include <hdf_log.h>
+#include "hdf_core_log.h"
 #include <osal_mem.h>
 #include "camera_buffer_manager_adapter.h"
 #include "virtual_malloc.h"
diff --git a/adapter/khdf/linux/model/network/wifi/platform/src/hdf_wlan_queue.c b/adapter/khdf/linux/model/network/wifi/platform/src/hdf_wlan_queue.c
index d0ac3cca7b54ff4dd0a4489482eb35eb833bba66..388c16094e60a79f9daeb85b658333fcf04c2c60 100644
--- a/adapter/khdf/linux/model/network/wifi/platform/src/hdf_wlan_queue.c
+++ b/adapter/khdf/linux/model/network/wifi/platform/src/hdf_wlan_queue.c
@@ -18,7 +18,7 @@
 
 #include "hdf_wlan_queue.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "osal_mutex.h"
 
diff --git a/adapter/khdf/linux/model/storage/emmc_adapter.c b/adapter/khdf/linux/model/storage/emmc_adapter.c
index d6ba8e03a5722195f0a9dc4a70f8d0a1a3054406..98ca2fa622189e78495cf8d7b9febeeaa78dc572 100644
--- a/adapter/khdf/linux/model/storage/emmc_adapter.c
+++ b/adapter/khdf/linux/model/storage/emmc_adapter.c
@@ -20,7 +20,7 @@
 #include <linux/mmc/card.h>
 #include <linux/mmc/host.h>
 #include "device_resource_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "emmc_if.h"
 #include "mmc_corex.h"
 #include "mmc_emmc.h"
diff --git a/adapter/khdf/linux/model/storage/mmc_adapter.c b/adapter/khdf/linux/model/storage/mmc_adapter.c
index 449d93f22f861e0b9638a3c91fbbb4f824405a6f..44216ef71a0a364589076a4f1489940c5154d8ba 100644
--- a/adapter/khdf/linux/model/storage/mmc_adapter.c
+++ b/adapter/khdf/linux/model/storage/mmc_adapter.c
@@ -18,7 +18,7 @@
 
 #include <linux/mmc/host.h>
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG mmc_adapter_c
 
diff --git a/adapter/khdf/linux/model/storage/vendor_adapter/hi35xx_mmc_adapter.c b/adapter/khdf/linux/model/storage/vendor_adapter/hi35xx_mmc_adapter.c
index 2951cb4ba2db9174e9bc2f3ae5ebdf37eff0c05d..51c66548fc1b7a6c0b604d95393a94b67614ba19 100644
--- a/adapter/khdf/linux/model/storage/vendor_adapter/hi35xx_mmc_adapter.c
+++ b/adapter/khdf/linux/model/storage/vendor_adapter/hi35xx_mmc_adapter.c
@@ -18,7 +18,7 @@
 
 #include <linux/mmc/host.h>
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG hi35xx_mmc_adapter_c
 
diff --git a/adapter/khdf/linux/model/storage/vendor_adapter/imx8mm_mmc_adapter.c b/adapter/khdf/linux/model/storage/vendor_adapter/imx8mm_mmc_adapter.c
index 3b2b60291dee5af0fb6e07576fdd76d488bb09ec..f43e52f6e8c8ed2ab9a62abd053fdc325a9e40b0 100644
--- a/adapter/khdf/linux/model/storage/vendor_adapter/imx8mm_mmc_adapter.c
+++ b/adapter/khdf/linux/model/storage/vendor_adapter/imx8mm_mmc_adapter.c
@@ -18,7 +18,7 @@
 
 #include <linux/mmc/host.h>
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG imx8mm_mmc_adapter_c
 
diff --git a/adapter/khdf/linux/model/usb/host/include/usb_net_adapter.h b/adapter/khdf/linux/model/usb/host/include/usb_net_adapter.h
index 349b05c93a2d29544befb0f9ae13c8ba886f2cf6..8c8258e8c956be0db8f634c904a2dd0f959b45fa 100755
--- a/adapter/khdf/linux/model/usb/host/include/usb_net_adapter.h
+++ b/adapter/khdf/linux/model/usb/host/include/usb_net_adapter.h
@@ -10,7 +10,7 @@
 #define HDF_NET_USB_ADAPTER_H
 
 #include "osal_mutex.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_usb_net_manager.h"
 
 #define MODULE_PARAM module_param
diff --git a/adapter/khdf/linux/model/usb/host/src/usb_pnp_notify.c b/adapter/khdf/linux/model/usb/host/src/usb_pnp_notify.c
index 5c32dc68d859b2983594b95cc6758330f5ae40b5..1ab1c7140fa45b7b865de33ca239fb8df971eac9 100644
--- a/adapter/khdf/linux/model/usb/host/src/usb_pnp_notify.c
+++ b/adapter/khdf/linux/model/usb/host/src/usb_pnp_notify.c
@@ -22,7 +22,7 @@
 #include <linux/usb.h>
 
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "securec.h"
 #include "usb_pnp_notify.h"
diff --git a/adapter/khdf/linux/osal/src/osal_cdev.c b/adapter/khdf/linux/osal/src/osal_cdev.c
index 6ca1f81888b918ce03bb7236c13b9c6e1178920f..4d7f6271e96f61f3e90c405de050b7f2a06e95b3 100644
--- a/adapter/khdf/linux/osal/src/osal_cdev.c
+++ b/adapter/khdf/linux/osal/src/osal_cdev.c
@@ -20,7 +20,7 @@
 #include <linux/fs.h>
 #include <linux/version.h>
 #include "osal_cdev.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_file.h"
 #include "osal_mem.h"
 #include "osal_uaccess.h"
diff --git a/adapter/khdf/linux/osal/src/osal_file.c b/adapter/khdf/linux/osal/src/osal_file.c
index e459206d5a679f6438fcac969b4ff4df04078034..0c833dbd7217ae97752b23d081681fdd65a78b8e 100644
--- a/adapter/khdf/linux/osal/src/osal_file.c
+++ b/adapter/khdf/linux/osal/src/osal_file.c
@@ -19,7 +19,7 @@
 #include "osal_file.h"
 #include <linux/fs.h>
 #include <asm/uaccess.h>
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG osal_file
 
diff --git a/adapter/khdf/linux/osal/src/osal_firmware.c b/adapter/khdf/linux/osal/src/osal_firmware.c
index 5ce6b66016f7faae6fd432d17adcfb5d9f6287c1..b5a27e1eca17539b5b121cd4ae404f637c450851 100644
--- a/adapter/khdf/linux/osal/src/osal_firmware.c
+++ b/adapter/khdf/linux/osal/src/osal_firmware.c
@@ -20,7 +20,7 @@
 #include <linux/export.h>
 #include <linux/firmware.h>
 #include <linux/string.h>
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG osal_fw
 
diff --git a/adapter/khdf/linux/osal/src/osal_irq.c b/adapter/khdf/linux/osal/src/osal_irq.c
index 0b024be0b41a05fdc01c41a09fde850876c355e6..27113b02a9e6863e7b059fe17b3b2c5c4187114f 100644
--- a/adapter/khdf/linux/osal/src/osal_irq.c
+++ b/adapter/khdf/linux/osal/src/osal_irq.c
@@ -19,7 +19,7 @@
 #include "osal_irq.h"
 #include <linux/export.h>
 #include <linux/interrupt.h>
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG osal_irq
 
diff --git a/adapter/khdf/linux/osal/src/osal_mem.c b/adapter/khdf/linux/osal/src/osal_mem.c
index 7ebfc1fa46d012f5df75adb19e16629e87353edb..80bb6ef12edde33c347c496003013903f87d41e9 100644
--- a/adapter/khdf/linux/osal/src/osal_mem.c
+++ b/adapter/khdf/linux/osal/src/osal_mem.c
@@ -21,7 +21,7 @@
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/vmalloc.h>
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "securec.h"
 
 #define HDF_LOG_TAG osal_mem
diff --git a/adapter/khdf/linux/osal/src/osal_mutex.c b/adapter/khdf/linux/osal/src/osal_mutex.c
index 180954076b52c052b379875d3a549f1fea1e6e53..b591e154e2b395a050bc5c8512e2ea5f18b6a9b1 100644
--- a/adapter/khdf/linux/osal/src/osal_mutex.c
+++ b/adapter/khdf/linux/osal/src/osal_mutex.c
@@ -19,7 +19,7 @@
 #include "osal_mutex.h"
 #include <linux/export.h>
 #include <linux/mutex.h>
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 
 #define HDF_LOG_TAG osal_mutex
diff --git a/adapter/khdf/linux/osal/src/osal_sem.c b/adapter/khdf/linux/osal/src/osal_sem.c
index 7376b2eadef187b92ad17c6befc76b81111277e7..628946daed0611b10c63a719a6f7c36e6a2b12e9 100644
--- a/adapter/khdf/linux/osal/src/osal_sem.c
+++ b/adapter/khdf/linux/osal/src/osal_sem.c
@@ -20,7 +20,7 @@
 #include <linux/export.h>
 #include <linux/semaphore.h>
 #include <linux/timer.h>
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 
 #define HDF_LOG_TAG osal_sem
diff --git a/adapter/khdf/linux/osal/src/osal_spinlock.c b/adapter/khdf/linux/osal/src/osal_spinlock.c
index 0bb1d475f41301b19044ae7fdf661b220e466033..2758db361441ead4a778ca38ad1026c09bb818a9 100644
--- a/adapter/khdf/linux/osal/src/osal_spinlock.c
+++ b/adapter/khdf/linux/osal/src/osal_spinlock.c
@@ -19,7 +19,7 @@
 #include "osal_spinlock.h"
 #include <linux/export.h>
 #include <linux/spinlock.h>
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 
 #define HDF_LOG_TAG osal_spinlock
diff --git a/adapter/khdf/linux/osal/src/osal_thread.c b/adapter/khdf/linux/osal/src/osal_thread.c
index 6b68990a59ac9ea7b2a3247dc3e7f5dcaa76f2d1..66cd59b4493646d8d7a4c0a918d062317d2ce8d4 100644
--- a/adapter/khdf/linux/osal/src/osal_thread.c
+++ b/adapter/khdf/linux/osal/src/osal_thread.c
@@ -25,7 +25,7 @@
 #include <linux/types.h>
 #include <uapi/linux/sched.h>
 #include <uapi/linux/sched/types.h>
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "securec.h"
 
diff --git a/adapter/khdf/linux/osal/src/osal_time.c b/adapter/khdf/linux/osal/src/osal_time.c
index 42e5cbbe3a0e6605bd002b3b3c3a755a37f19e9b..51a2991331977ad1d605e0ebb54d5bf5be5ac302 100644
--- a/adapter/khdf/linux/osal/src/osal_time.c
+++ b/adapter/khdf/linux/osal/src/osal_time.c
@@ -22,7 +22,7 @@
 #include <linux/rtc.h>
 #include <linux/string.h>
 #include <linux/timekeeping.h>
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_math.h"
 #include "securec.h"
 
diff --git a/adapter/khdf/linux/osal/src/osal_timer.c b/adapter/khdf/linux/osal/src/osal_timer.c
index 1b926f319016df6c7822a88be7f62d5054022a72..62b15f8166a392eb3a1d014036b209e716f97dd1 100644
--- a/adapter/khdf/linux/osal/src/osal_timer.c
+++ b/adapter/khdf/linux/osal/src/osal_timer.c
@@ -21,7 +21,7 @@
 #include <linux/export.h>
 #include <linux/signal.h>
 #include <linux/timer.h>
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "osal_mutex.h"
 
diff --git a/adapter/khdf/linux/osal/src/osal_workqueue.c b/adapter/khdf/linux/osal/src/osal_workqueue.c
index 102fdf20cfacf8841bef8de8af03a7ab064dce94..367b1300ef10d3ff3e8976dd8348729a631a68d2 100644
--- a/adapter/khdf/linux/osal/src/osal_workqueue.c
+++ b/adapter/khdf/linux/osal/src/osal_workqueue.c
@@ -18,7 +18,7 @@
 
 #include "hdf_workqueue.h"
 #include <linux/workqueue.h>
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 
 #define HDF_LOG_TAG hdf_workqueue
diff --git a/adapter/khdf/linux/platform/adc/adc_iio_adapter.c b/adapter/khdf/linux/platform/adc/adc_iio_adapter.c
index ed6b0572a24df53fc9480b94bbcf759455745b69..1efd8e305c63d47aad0fdc7add3bf001aa1a0f23 100644
--- a/adapter/khdf/linux/platform/adc/adc_iio_adapter.c
+++ b/adapter/khdf/linux/platform/adc/adc_iio_adapter.c
@@ -19,7 +19,7 @@
 #include "device_resource_if.h"
 #include "hdf_base.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "securec.h"
 #include "adc_core.h"
diff --git a/adapter/khdf/linux/platform/clock/clock_adapter.c b/adapter/khdf/linux/platform/clock/clock_adapter.c
index b635322c9fc819301659667c100ef8aa4a50433e..b29312e4006ef522900c162d5becdc05fa19b80b 100644
--- a/adapter/khdf/linux/platform/clock/clock_adapter.c
+++ b/adapter/khdf/linux/platform/clock/clock_adapter.c
@@ -21,7 +21,7 @@
 #include "device_resource_if.h"
 #include "hdf_base.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "securec.h"
 #include "clock_core.h"
diff --git a/adapter/khdf/linux/platform/fwk/platform_trace.c b/adapter/khdf/linux/platform/fwk/platform_trace.c
index 999ddabdb158a588c047a29f82585dfae4137d62..d42ce95327139264a2518418b1be68a1a00dc4d7 100644
--- a/adapter/khdf/linux/platform/fwk/platform_trace.c
+++ b/adapter/khdf/linux/platform/fwk/platform_trace.c
@@ -13,7 +13,7 @@
  */
 #include "platform_trace.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_file.h"
 #include "osal_mem.h"
 #include "securec.h"
diff --git a/adapter/khdf/linux/platform/gpio/gpio_adapter.c b/adapter/khdf/linux/platform/gpio/gpio_adapter.c
index a5b725b19c2ead09be0d0ed67610b96545406c32..75e7d1989cce18c32fce2cc40645e4121b060189 100644
--- a/adapter/khdf/linux/platform/gpio/gpio_adapter.c
+++ b/adapter/khdf/linux/platform/gpio/gpio_adapter.c
@@ -25,7 +25,7 @@
 #include "hdf_base.h"
 #include "hdf_device_desc.h"
 #include "hdf_dlist.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "osal_mutex.h"
 
diff --git a/adapter/khdf/linux/platform/i2c/i2c_adapter.c b/adapter/khdf/linux/platform/i2c/i2c_adapter.c
index b86695a05e120e45c6221708d023ad9b68b62095..60d924895f1dff982cb5d82b6da6b784c91fdd17 100644
--- a/adapter/khdf/linux/platform/i2c/i2c_adapter.c
+++ b/adapter/khdf/linux/platform/i2c/i2c_adapter.c
@@ -18,7 +18,7 @@
 
 #include <linux/i2c.h>
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "i2c_core.h"
 #include "i2c_msg.h"
 #include "osal_mem.h"
diff --git a/adapter/khdf/linux/platform/mipi_csi/mipi_csi_dev.c b/adapter/khdf/linux/platform/mipi_csi/mipi_csi_dev.c
index 78bd6ce0257b472fcee49600d4ea884465ffcff6..abf00ceb7301b6fad6c3fd7a0a8784dd1100b20e 100644
--- a/adapter/khdf/linux/platform/mipi_csi/mipi_csi_dev.c
+++ b/adapter/khdf/linux/platform/mipi_csi/mipi_csi_dev.c
@@ -21,7 +21,7 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/version.h>
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "mipi_csi_core.h"
 #include "osal_mem.h"
 #include "securec.h"
diff --git a/adapter/khdf/linux/platform/mipi_csi/mipi_v4l2_adapter.c b/adapter/khdf/linux/platform/mipi_csi/mipi_v4l2_adapter.c
index c6e73b4e473d4d41bb58f6b7e98b8c9fb02198da..5e1bd4230725b169bff64e820e51b51edbf04d81 100644
--- a/adapter/khdf/linux/platform/mipi_csi/mipi_v4l2_adapter.c
+++ b/adapter/khdf/linux/platform/mipi_csi/mipi_v4l2_adapter.c
@@ -26,7 +26,7 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/version.h>
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "mipi_csi_core.h"
 
 #define HDF_LOG_TAG          mipi_v4l2_adapter
diff --git a/adapter/khdf/linux/platform/mipi_dsi/mipi_drm_adapter.c b/adapter/khdf/linux/platform/mipi_dsi/mipi_drm_adapter.c
index 6fc1687695a28968a60e659e6cf64635f0a454b5..350f4efbacbced563a65a115c367debd0c115864 100644
--- a/adapter/khdf/linux/platform/mipi_dsi/mipi_drm_adapter.c
+++ b/adapter/khdf/linux/platform/mipi_dsi/mipi_drm_adapter.c
@@ -21,7 +21,7 @@
 #include <linux/of.h>
 #include <video/mipi_display.h>
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "mipi_dsi_core.h"
 #include "mipi_dsi_if.h"
 #include "osal_time.h"
diff --git a/adapter/khdf/linux/platform/mipi_dsi/mipi_tx_dev.c b/adapter/khdf/linux/platform/mipi_dsi/mipi_tx_dev.c
index 488562566916d65d3d8347a7ddfe6216cb471d63..1f09a36dac91e10742a6f2dd4dddf181bb7583fa 100644
--- a/adapter/khdf/linux/platform/mipi_dsi/mipi_tx_dev.c
+++ b/adapter/khdf/linux/platform/mipi_dsi/mipi_tx_dev.c
@@ -31,7 +31,7 @@
 #include <linux/seq_file.h>
 #include <linux/version.h>
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "mipi_dsi_core.h"
 #include "mipi_tx_reg.h"
 #include "osal_io.h"
diff --git a/adapter/khdf/linux/platform/mipi_dsi/mipi_tx_hi35xx.c b/adapter/khdf/linux/platform/mipi_dsi/mipi_tx_hi35xx.c
index bc707fc4d6dcc0c5fc038c939481a3094b4c1e13..95308bc197865cc10868a6cdc4dbd23958b0dcf1 100644
--- a/adapter/khdf/linux/platform/mipi_dsi/mipi_tx_hi35xx.c
+++ b/adapter/khdf/linux/platform/mipi_dsi/mipi_tx_hi35xx.c
@@ -20,7 +20,7 @@
 #include <linux/io.h>
 #include <linux/uaccess.h>
 #include <linux/version.h>
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "securec.h"
 #include "osal_time.h"
 #include "osal_io.h"
diff --git a/adapter/khdf/linux/platform/pwm/pwm_adapter.c b/adapter/khdf/linux/platform/pwm/pwm_adapter.c
index 9caeb9292632e545cbcf450087f744e24b91337a..25fad95f49571fb75b795133ddedf4fdc8e273d9 100644
--- a/adapter/khdf/linux/platform/pwm/pwm_adapter.c
+++ b/adapter/khdf/linux/platform/pwm/pwm_adapter.c
@@ -18,7 +18,7 @@
 
 #include <linux/pwm.h>
 #include "device_resource_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "pwm_core.h"
 
diff --git a/adapter/khdf/linux/platform/pwm/pwm_hi35xx_linux.c b/adapter/khdf/linux/platform/pwm/pwm_hi35xx_linux.c
index e4774c5d21c3b20cb67c696e963f3e251294bcf7..222769d6ef9a5d50f18e51f0c730f456c1cc4995 100644
--- a/adapter/khdf/linux/platform/pwm/pwm_hi35xx_linux.c
+++ b/adapter/khdf/linux/platform/pwm/pwm_hi35xx_linux.c
@@ -22,7 +22,7 @@
 #include <linux/of_platform.h>
 #include <linux/pwm.h>
 #include <linux/version.h>
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG pwm_hi35xx_linux
 #define PWM_ENABLE_MASK 0x1
diff --git a/adapter/khdf/linux/platform/regulator/regulator_adapter.c b/adapter/khdf/linux/platform/regulator/regulator_adapter.c
index 12d800756b08f315a38822ecc2088e9556bcd9d2..a74c3f6859dbd2e47ab75a21cd5ca078512d85e1 100755
--- a/adapter/khdf/linux/platform/regulator/regulator_adapter.c
+++ b/adapter/khdf/linux/platform/regulator/regulator_adapter.c
@@ -19,7 +19,7 @@
 #include <linux/regulator/consumer.h>
 #include "device_resource_if.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 
 #define HDF_LOG_TAG regulator_linux_adapter
diff --git a/adapter/khdf/linux/platform/regulator/regulator_adapter_consumer.c b/adapter/khdf/linux/platform/regulator/regulator_adapter_consumer.c
index 1b4accdd54b3180e384b970f54d7d512eea34aab..0a9ee56da98c32f1d702ea2250b8626436c6a9b1 100755
--- a/adapter/khdf/linux/platform/regulator/regulator_adapter_consumer.c
+++ b/adapter/khdf/linux/platform/regulator/regulator_adapter_consumer.c
@@ -19,7 +19,7 @@
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>
 #include <linux/regulator/consumer.h>
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG regulator_linux_adapter
 
diff --git a/adapter/khdf/linux/platform/rtc/rtc_adapter.c b/adapter/khdf/linux/platform/rtc/rtc_adapter.c
index 1772e0d17612052ac0d64b067f79dbea5754b1b8..9a7bd30da23fba28897bb7bb941545870190a7d3 100644
--- a/adapter/khdf/linux/platform/rtc/rtc_adapter.c
+++ b/adapter/khdf/linux/platform/rtc/rtc_adapter.c
@@ -19,7 +19,7 @@
 #include <linux/rtc.h>
 #include "device_resource_if.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "rtc_core.h"
 
 #define HDF_LOG_TAG RTC_ADAPTER
diff --git a/adapter/khdf/linux/platform/spi/spi_adapter.c b/adapter/khdf/linux/platform/spi/spi_adapter.c
index dd1bc43ea2ff7ade33f7cf970a8be363fe5e170f..6295f13251ca676470b205c2b95fe54004fda442 100644
--- a/adapter/khdf/linux/platform/spi/spi_adapter.c
+++ b/adapter/khdf/linux/platform/spi/spi_adapter.c
@@ -22,7 +22,7 @@
 #include "device_resource_if.h"
 #include "hdf_base.h"
 #include "hdf_dlist.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_io.h"
 #include "osal_mem.h"
 #include "osal_time.h"
diff --git a/adapter/khdf/linux/platform/uart/uart_adapter.c b/adapter/khdf/linux/platform/uart/uart_adapter.c
index 89af4e0aaa9a4a6c7ab57950b8e5d2e8173140da..d61aba92f22cba0eb6c6fe72249c83d7ca30917e 100644
--- a/adapter/khdf/linux/platform/uart/uart_adapter.c
+++ b/adapter/khdf/linux/platform/uart/uart_adapter.c
@@ -23,7 +23,7 @@
 #include <linux/version.h>
 #include "device_resource_if.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_io.h"
 #include "osal_mem.h"
 #include "osal_time.h"
diff --git a/adapter/khdf/linux/platform/watchdog/watchdog_adapter.c b/adapter/khdf/linux/platform/watchdog/watchdog_adapter.c
index 035971df18b2fff8f00ec9c255dc711f5826799b..8ded4e61f5f843ee1060d2ba341da4540aab025b 100644
--- a/adapter/khdf/linux/platform/watchdog/watchdog_adapter.c
+++ b/adapter/khdf/linux/platform/watchdog/watchdog_adapter.c
@@ -23,7 +23,7 @@
 #include <linux/version.h>
 #include "device_resource_if.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_io.h"
 #include "osal_mem.h"
 #include "osal_time.h"
diff --git a/adapter/khdf/linux/test/platform/i2c/i2c_adapter_dummy.c b/adapter/khdf/linux/test/platform/i2c/i2c_adapter_dummy.c
index 10b21fa344bb5f14a11b02a1372c50fe162fb5b0..8a56279479ebcf27e05bcfa766a40c8320320f1f 100644
--- a/adapter/khdf/linux/test/platform/i2c/i2c_adapter_dummy.c
+++ b/adapter/khdf/linux/test/platform/i2c/i2c_adapter_dummy.c
@@ -19,7 +19,7 @@
 #include <linux/i2c.h>
 
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "i2c_core.h"
 #include "osal_mem.h"
 #include "i2c_msg.h"
diff --git a/adapter/khdf/linux/test/test_helper_driver/src/test_helper_driver.c b/adapter/khdf/linux/test/test_helper_driver/src/test_helper_driver.c
index 012ed182ee847c9b432f1368c2a4765e55f48111..25baa706b99bf881d517b38257eb696256d6fb81 100644
--- a/adapter/khdf/linux/test/test_helper_driver/src/test_helper_driver.c
+++ b/adapter/khdf/linux/test/test_helper_driver/src/test_helper_driver.c
@@ -20,7 +20,7 @@
 #include "devsvc_manager_clnt.h"
 #include "hdf_device_object.h"
 #include "hdf_driver_module.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_pm.h"
 #include "osal_file.h"
 #include "osal_mem.h"
diff --git a/adapter/khdf/liteos/manager/src/devmgr_pm_reg.c b/adapter/khdf/liteos/manager/src/devmgr_pm_reg.c
index c7d66a068163b8c82079da8a83c4a4781af718e4..a08fe7356859bd51739fe0b993384704c3c9fd35 100755
--- a/adapter/khdf/liteos/manager/src/devmgr_pm_reg.c
+++ b/adapter/khdf/liteos/manager/src/devmgr_pm_reg.c
@@ -31,7 +31,7 @@
 #include <los_pm.h>
 #include "devmgr_service.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG devmgr_pm
 
diff --git a/adapter/khdf/liteos/model/bus/usb/hdf_usb.c b/adapter/khdf/liteos/model/bus/usb/hdf_usb.c
index 0e26a90f9a4bc85c2b5c35b82767f880b76eb904..3beb81c186f6bcd8011623b0367dcbb00ad4182b 100644
--- a/adapter/khdf/liteos/model/bus/usb/hdf_usb.c
+++ b/adapter/khdf/liteos/model/bus/usb/hdf_usb.c
@@ -28,7 +28,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "device_resource_if.h"
 #include "hdf_usb.h"
 
diff --git a/adapter/khdf/liteos/model/network/wifi/platform/src/hdf_wlan_queue.c b/adapter/khdf/liteos/model/network/wifi/platform/src/hdf_wlan_queue.c
index fb0579bac9e6ef3ab45b4ceb89767710d84f05da..ca43c7c82faefa98139c298246e869b2544feba6 100644
--- a/adapter/khdf/liteos/model/network/wifi/platform/src/hdf_wlan_queue.c
+++ b/adapter/khdf/liteos/model/network/wifi/platform/src/hdf_wlan_queue.c
@@ -28,7 +28,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "los_queue.h"
 #include "osal_mem.h"
 #include "hdf_wlan_queue.h"
diff --git a/adapter/khdf/liteos/model/storage/src/mmc/mmc_block_lite.c b/adapter/khdf/liteos/model/storage/src/mmc/mmc_block_lite.c
index 991607647fd50797c2f5eedd17c6bf0999bd8c5a..ef0c9a9b7200f7bf33cd72b93f8f455620357c8f 100644
--- a/adapter/khdf/liteos/model/storage/src/mmc/mmc_block_lite.c
+++ b/adapter/khdf/liteos/model/storage/src/mmc/mmc_block_lite.c
@@ -31,7 +31,7 @@
 #include "disk.h"
 #include "fs/fs.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "mmc_block.h"
 #include "mmc_sd.h"
 #include "sys/ioctl.h"
diff --git a/adapter/khdf/liteos/model/storage/src/mtd/mtd_block_lite.c b/adapter/khdf/liteos/model/storage/src/mtd/mtd_block_lite.c
index 510928cb64d61bbbf9fc8a4989878a4a387a7a97..4645745d6428aec211d0ffd164b4566e1241046a 100644
--- a/adapter/khdf/liteos/model/storage/src/mtd/mtd_block_lite.c
+++ b/adapter/khdf/liteos/model/storage/src/mtd/mtd_block_lite.c
@@ -29,7 +29,7 @@
  */
 
 #include "fs/fs.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "mtd_block.h"
 #include "mtd_core.h"
 #include "sys/ioctl.h"
diff --git a/adapter/khdf/liteos/model/storage/src/mtd/mtd_char_lite.c b/adapter/khdf/liteos/model/storage/src/mtd/mtd_char_lite.c
index 040d92fd9fdcd1b9d6af3995b0c1de76914690d1..7cb9f9ae5dc7dbedf2dcc987e677fee5857ba7a8 100644
--- a/adapter/khdf/liteos/model/storage/src/mtd/mtd_char_lite.c
+++ b/adapter/khdf/liteos/model/storage/src/mtd/mtd_char_lite.c
@@ -36,7 +36,7 @@
 #include "string.h"
 #include "user_copy.h"
 
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "mtd_char.h"
 #include "mtd_core.h"
 #include "mtd_legacy_lite.h"
diff --git a/adapter/khdf/liteos/model/storage/src/mtd/mtd_legacy_lite.c b/adapter/khdf/liteos/model/storage/src/mtd/mtd_legacy_lite.c
index 6d0e07bfc956b1aafe597fbf6bdcb773ae615e93..e3eab1c2d11c9e4285b7765e0bdae385fd624e62 100644
--- a/adapter/khdf/liteos/model/storage/src/mtd/mtd_legacy_lite.c
+++ b/adapter/khdf/liteos/model/storage/src/mtd/mtd_legacy_lite.c
@@ -29,7 +29,7 @@
  */
 
 #include "mtd_legacy_lite.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "mtd_core.h"
 #include "mtd_list.h"
 #include "osal_mem.h"
diff --git a/adapter/khdf/liteos/model/usb/host/src/usb_pnp_manager.c b/adapter/khdf/liteos/model/usb/host/src/usb_pnp_manager.c
index 5d829e2ae31ce1047c28526080091bda97592d32..c35a6850ee46793d00d2bf986d0d5134ebb4c012 100644
--- a/adapter/khdf/liteos/model/usb/host/src/usb_pnp_manager.c
+++ b/adapter/khdf/liteos/model/usb/host/src/usb_pnp_manager.c
@@ -32,7 +32,7 @@
 #include "hdf_base.h"
 #include "hdf_device_desc.h"
 #include "hdf_io_service_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "usb_ddk_pnp_loader.h"
 
 #define HDF_LOG_TAG usb_pnp_manager
diff --git a/adapter/khdf/liteos/model/usb/host/src/usb_pnp_notify.c b/adapter/khdf/liteos/model/usb/host/src/usb_pnp_notify.c
index 3fbd13aa701da0d874eef1d570769ede6e18780c..b2dad9f88b56a6ff998506ede835cc9600bdfe66 100644
--- a/adapter/khdf/liteos/model/usb/host/src/usb_pnp_notify.c
+++ b/adapter/khdf/liteos/model/usb/host/src/usb_pnp_notify.c
@@ -36,7 +36,7 @@
 #include "devsvc_manager_clnt.h"
 #include "fs/fs.h"
 #include "hdf_device_object.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "implementation/global_implementation.h"
 #include "linux_usb.h"
 #include "osal_file.h"
diff --git a/adapter/khdf/liteos/model/usb/host/src/usb_test_pnp_notify.c b/adapter/khdf/liteos/model/usb/host/src/usb_test_pnp_notify.c
index 38eb63f9f95023fa0c6961639d9ddd55248408fe..19c0ce480b174bb846a5984d0f1aaf441d83d4b5 100644
--- a/adapter/khdf/liteos/model/usb/host/src/usb_test_pnp_notify.c
+++ b/adapter/khdf/liteos/model/usb/host/src/usb_test_pnp_notify.c
@@ -30,7 +30,7 @@
 
 #include "devsvc_manager_clnt.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG USB_TEST_PNP_NOTIFY
 
diff --git a/adapter/khdf/liteos/osal/src/osal_cdev.c b/adapter/khdf/liteos/osal/src/osal_cdev.c
index 656b84f484604d0af389944beb84afb774ad24fb..2c56a98763b2ebb658cd138376ec9758d48724a3 100644
--- a/adapter/khdf/liteos/osal/src/osal_cdev.c
+++ b/adapter/khdf/liteos/osal/src/osal_cdev.c
@@ -29,7 +29,7 @@
  */
 
 #include <linux/fs.h>
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_io_service.h"
 #include "osal_cdev.h"
 #include "osal_file.h"
diff --git a/adapter/khdf/liteos/osal/src/osal_file.c b/adapter/khdf/liteos/osal/src/osal_file.c
index d5da1a14e461b45de1c61dd01d7ec7d28655a753..98def91801dd6bf2a62bec6611e347216af9479f 100644
--- a/adapter/khdf/liteos/osal/src/osal_file.c
+++ b/adapter/khdf/liteos/osal/src/osal_file.c
@@ -33,7 +33,7 @@
 #include "unistd.h"
 #include "limits.h"
 #include "sys/stat.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG osal_file
 
diff --git a/adapter/khdf/liteos/osal/src/osal_firmware.c b/adapter/khdf/liteos/osal/src/osal_firmware.c
index 3b90f7fb4c0ed6d46795092f136c97be20d3a35c..457d445d40184dfb46b0c29c747b0ca495e97074 100644
--- a/adapter/khdf/liteos/osal/src/osal_firmware.c
+++ b/adapter/khdf/liteos/osal/src/osal_firmware.c
@@ -33,7 +33,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include "fs/file.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 
 #define HDF_LOG_TAG osal_fw
diff --git a/adapter/khdf/liteos/osal/src/osal_irq.c b/adapter/khdf/liteos/osal/src/osal_irq.c
index 33f53ed184cbbdba30297daac0b95fe6ea35cbf7..88dd737aa2ca7b221a5d83e77a748f604733b36a 100644
--- a/adapter/khdf/liteos/osal/src/osal_irq.c
+++ b/adapter/khdf/liteos/osal/src/osal_irq.c
@@ -30,7 +30,7 @@
 
 #include "osal_irq.h"
 #include "los_hwi.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define OSAL_LOG_TAG osal_irq
 
diff --git a/adapter/khdf/liteos/osal/src/osal_mem.c b/adapter/khdf/liteos/osal/src/osal_mem.c
index 0c2bc5f8719f7ae14370c80e14b8819d87862211..7ecc282c135b9c46b65940643b0090665792a0a9 100644
--- a/adapter/khdf/liteos/osal/src/osal_mem.c
+++ b/adapter/khdf/liteos/osal/src/osal_mem.c
@@ -31,7 +31,7 @@
 #include "osal_mem.h"
 #include "los_memory.h"
 #include "securec.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG osal_mem
 
diff --git a/adapter/khdf/liteos/osal/src/osal_mutex.c b/adapter/khdf/liteos/osal/src/osal_mutex.c
index b388052069227b89cb4ca28cd9eca03633e12230..1b129ec58b084c3e86526c9500a964750384e8d8 100644
--- a/adapter/khdf/liteos/osal/src/osal_mutex.c
+++ b/adapter/khdf/liteos/osal/src/osal_mutex.c
@@ -31,7 +31,7 @@
 #include "osal_mutex.h"
 #include "los_mux.h"
 #include "los_sys.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 
 #define HDF_LOG_TAG osal_mutex
diff --git a/adapter/khdf/liteos/osal/src/osal_sem.c b/adapter/khdf/liteos/osal/src/osal_sem.c
index 6633ccdf260ac3e06b7f43a30bfb06890367baa2..59648c4987fc754435a6227d4e76241377b6142d 100644
--- a/adapter/khdf/liteos/osal/src/osal_sem.c
+++ b/adapter/khdf/liteos/osal/src/osal_sem.c
@@ -32,7 +32,7 @@
 #include "los_hwi.h"
 #include "los_sem.h"
 #include "los_typedef.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG osal_sem
 #define HDF_INVALID_SEM_ID UINT32_MAX
diff --git a/adapter/khdf/liteos/osal/src/osal_spinlock.c b/adapter/khdf/liteos/osal/src/osal_spinlock.c
index eb85774d118b321b526962e1c10482b244358c48..9b1a19126b45de52be811c8f5f2def087bf2d84a 100644
--- a/adapter/khdf/liteos/osal/src/osal_spinlock.c
+++ b/adapter/khdf/liteos/osal/src/osal_spinlock.c
@@ -30,7 +30,7 @@
 
 #include "osal_spinlock.h"
 #include "linux/spinlock.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 
 #define HDF_LOG_TAG osal_spinlock
diff --git a/adapter/khdf/liteos/osal/src/osal_thread.c b/adapter/khdf/liteos/osal/src/osal_thread.c
index b3e37f4d1b3a39657e43a196c675a45a3d15a157..6b95654b9fca9141da98c1c99c7fbca3b1c0dbc7 100644
--- a/adapter/khdf/liteos/osal/src/osal_thread.c
+++ b/adapter/khdf/liteos/osal/src/osal_thread.c
@@ -32,7 +32,7 @@
 #include "los_hwi.h"
 #include "los_task.h"
 #include "securec.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 
 #define HDF_LOG_TAG osal_thread
diff --git a/adapter/khdf/liteos/osal/src/osal_time.c b/adapter/khdf/liteos/osal/src/osal_time.c
index 0e5eb8f415195a5ca7003083b1edffd7f3bd0865..4f67c613f53ca3ef894aa3fec96aaf6bce913e3d 100644
--- a/adapter/khdf/liteos/osal/src/osal_time.c
+++ b/adapter/khdf/liteos/osal/src/osal_time.c
@@ -33,7 +33,7 @@
 #include <time.h>
 #include "los_sys.h"
 #include "los_task.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG osal_time
 
diff --git a/adapter/khdf/liteos/osal/src/osal_timer.c b/adapter/khdf/liteos/osal/src/osal_timer.c
index cd1a44b857dd9d281bd513aebab2e58c1212bdf6..f4ceebcb52b50981bde3e81df6b7d1cbcacb4d87 100644
--- a/adapter/khdf/liteos/osal/src/osal_timer.c
+++ b/adapter/khdf/liteos/osal/src/osal_timer.c
@@ -32,7 +32,7 @@
 #include "los_hwi.h"
 #include "los_swtmr.h"
 #include "los_swtmr_pri.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 
 #define HDF_LOG_TAG osal_timer
diff --git a/adapter/khdf/liteos/osal/src/osal_workqueue.c b/adapter/khdf/liteos/osal/src/osal_workqueue.c
index 22348b006265ca72dc3cc363715a3fa1e7e7a800..c1cd04ac72a38c73ff4cbe1081e33e23fce6d7c7 100644
--- a/adapter/khdf/liteos/osal/src/osal_workqueue.c
+++ b/adapter/khdf/liteos/osal/src/osal_workqueue.c
@@ -30,7 +30,7 @@
 
 #include "hdf_workqueue.h"
 #include "linux/workqueue.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 
 #define HDF_LOG_TAG hdf_workqueue
diff --git a/adapter/khdf/liteos/platform/src/gpio_dev.c b/adapter/khdf/liteos/platform/src/gpio_dev.c
index 7130ce8753b4a89e6f01f8c479d0e1c965a32e54..5314ce10804b30882285a00c22919389956d3950 100644
--- a/adapter/khdf/liteos/platform/src/gpio_dev.c
+++ b/adapter/khdf/liteos/platform/src/gpio_dev.c
@@ -34,7 +34,7 @@
 #include "gpio_core.h"
 #include "gpio_if.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "user_copy.h"
 
diff --git a/adapter/khdf/liteos/platform/src/platform_trace.c b/adapter/khdf/liteos/platform/src/platform_trace.c
index 536a27816eb8b567a8a05ea52762eb1f4dac2956..365ef01e992939fd891743026dba8a565d4b0fd5 100644
--- a/adapter/khdf/liteos/platform/src/platform_trace.c
+++ b/adapter/khdf/liteos/platform/src/platform_trace.c
@@ -29,7 +29,7 @@
  */
 #include "platform_trace.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "los_trace.h"
 
 int32_t PlatformTraceStart(void)
diff --git a/adapter/khdf/liteos/platform/src/spi_dev.c b/adapter/khdf/liteos/platform/src/spi_dev.c
index b809b6cb2bfbe4979f6f8399442f5f925138a785..6af597ecda065cb74d38dd2d033bd15b979e9913 100644
--- a/adapter/khdf/liteos/platform/src/spi_dev.c
+++ b/adapter/khdf/liteos/platform/src/spi_dev.c
@@ -31,7 +31,7 @@
 #include "fs/driver.h"
 #include "securec.h"
 #include "user_copy.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "spi_dev.h"
 
diff --git a/adapter/khdf/liteos/platform/src/uart_dev.c b/adapter/khdf/liteos/platform/src/uart_dev.c
index 34f7464df4eeff42c024b5b64495ec6f80fd3595..2c08682e7de2d0bc199a58ae8e42104c862eb9b1 100644
--- a/adapter/khdf/liteos/platform/src/uart_dev.c
+++ b/adapter/khdf/liteos/platform/src/uart_dev.c
@@ -31,7 +31,7 @@
 #include "fs/driver.h"
 #include "securec.h"
 #include "user_copy.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "uart_dev.h"
 
diff --git a/adapter/khdf/liteos_m/core/common/src/devmgr_service_start.c b/adapter/khdf/liteos_m/core/common/src/devmgr_service_start.c
index a1c4730da174a26eeb66df24a9bb369dff6ecde7..ac670996f586519311aab7e146fd0aa733dbe009 100644
--- a/adapter/khdf/liteos_m/core/common/src/devmgr_service_start.c
+++ b/adapter/khdf/liteos_m/core/common/src/devmgr_service_start.c
@@ -35,7 +35,7 @@
 #include "hdf_base.h"
 #include "hdf_device_node.h"
 #include "hdf_io_service.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_sbuf.h"
 #include <los_pm.h>
 
diff --git a/adapter/khdf/liteos_m/core/common/src/hdf_device_node_ext.c b/adapter/khdf/liteos_m/core/common/src/hdf_device_node_ext.c
index 74877266ffa33c5345a648db678dd5e5338b9f45..4b2cc15dee3aa0bd3dad51e51e3d94b9fc7e8dce 100644
--- a/adapter/khdf/liteos_m/core/common/src/hdf_device_node_ext.c
+++ b/adapter/khdf/liteos_m/core/common/src/hdf_device_node_ext.c
@@ -33,7 +33,7 @@
 #include "hdf_base.h"
 #include "hdf_device_desc.h"
 #include "hdf_io_service.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_sbuf.h"
 #include "osal_mem.h"
 
diff --git a/adapter/khdf/liteos_m/osal/src/osal_mem.c b/adapter/khdf/liteos_m/osal/src/osal_mem.c
index 779d03a8047f0f77655f75baff89766c5e020ef5..557373be25bffb35f5672c93bbd4d99884371f8f 100644
--- a/adapter/khdf/liteos_m/osal/src/osal_mem.c
+++ b/adapter/khdf/liteos_m/osal/src/osal_mem.c
@@ -29,7 +29,7 @@
  */
 
 #include "osal_mem.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "los_memory.h"
 #include "osal_atomic_def.h"
 #include "securec.h"
diff --git a/adapter/khdf/liteos_m/osal/src/osal_mutex.c b/adapter/khdf/liteos_m/osal/src/osal_mutex.c
index 0cedac2fb88391768c955c7e9915bb21d45e962e..6332913c8ec109017714fefcb2ad07e32d0db95c 100644
--- a/adapter/khdf/liteos_m/osal/src/osal_mutex.c
+++ b/adapter/khdf/liteos_m/osal/src/osal_mutex.c
@@ -29,7 +29,7 @@
  */
 
 #include "osal_mutex.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "los_mux.h"
 
 #define HDF_LOG_TAG osal_mutex
diff --git a/adapter/khdf/liteos_m/osal/src/osal_sem.c b/adapter/khdf/liteos_m/osal/src/osal_sem.c
index 94b7cd9121b3382ef5d1ed547f85f56bdb935a45..80c43277fdc06e16649724c79cab48af07f996c6 100644
--- a/adapter/khdf/liteos_m/osal/src/osal_sem.c
+++ b/adapter/khdf/liteos_m/osal/src/osal_sem.c
@@ -36,7 +36,7 @@
 #ifndef __LITEOS_M__
 #include "los_typedef.h"
 #endif
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG osal_sem
 #define HDF_INVALID_SEM_ID UINT32_MAX
diff --git a/adapter/khdf/liteos_m/osal/src/osal_spinlock.c b/adapter/khdf/liteos_m/osal/src/osal_spinlock.c
index 5ae8a5ed37b6aa0de9e561bd63051d584f071969..b1889772322c910c96fd6ea52b0e0eada465612c 100644
--- a/adapter/khdf/liteos_m/osal/src/osal_spinlock.c
+++ b/adapter/khdf/liteos_m/osal/src/osal_spinlock.c
@@ -29,7 +29,7 @@
  */
 
 #include "osal_spinlock.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "los_mux.h"
 
 #define HDF_LOG_TAG osal_spinlock
diff --git a/adapter/khdf/liteos_m/osal/src/osal_thread.c b/adapter/khdf/liteos_m/osal/src/osal_thread.c
index d84b29fd525031841af65abc4df77c356e2bd135..72dd35f5aaac70c75546033bc0a4419aed5a5437 100644
--- a/adapter/khdf/liteos_m/osal/src/osal_thread.c
+++ b/adapter/khdf/liteos_m/osal/src/osal_thread.c
@@ -29,7 +29,7 @@
  */
 
 #include "osal_thread.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "los_interrupt.h"
 #include "los_task.h"
 #include "osal_mem.h"
diff --git a/adapter/khdf/liteos_m/osal/src/osal_time.c b/adapter/khdf/liteos_m/osal/src/osal_time.c
index 189abebde740163fbcc9450712afb577be030f7b..185d60f1da469fa843412c27cfe02dccf617759d 100644
--- a/adapter/khdf/liteos_m/osal/src/osal_time.c
+++ b/adapter/khdf/liteos_m/osal/src/osal_time.c
@@ -31,7 +31,7 @@
 #include "osal_time.h"
 #include <los_config.h>
 #include <time.h>
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "los_task.h"
 
 #define HDF_LOG_TAG osal_time
diff --git a/adapter/khdf/liteos_m/osal/src/osal_timer.c b/adapter/khdf/liteos_m/osal/src/osal_timer.c
index e1403468191c133f209a6050b3b37c1664b1e51a..92becabba870ade57100331f6bbfbe5497f85e27 100644
--- a/adapter/khdf/liteos_m/osal/src/osal_timer.c
+++ b/adapter/khdf/liteos_m/osal/src/osal_timer.c
@@ -29,7 +29,7 @@
  */
 
 #include "osal_timer.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "los_interrupt.h"
 #include "los_swtmr.h"
 #include "osal_mem.h"
diff --git a/adapter/khdf/liteos_m/test/sample_driver/src/sample_driver.c b/adapter/khdf/liteos_m/test/sample_driver/src/sample_driver.c
index f7a95e4e10316f838e3f7e9f6b6df252d94c9a40..1d1d151a3b78ba6d9d8f7834b95cdd21fc38822e 100644
--- a/adapter/khdf/liteos_m/test/sample_driver/src/sample_driver.c
+++ b/adapter/khdf/liteos_m/test/sample_driver/src/sample_driver.c
@@ -29,7 +29,7 @@
  */
 
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "sample_service.h"
 
 #define HDF_LOG_TAG sample_driver
diff --git a/adapter/khdf/uniproton/core/common/src/devmgr_service_start.c b/adapter/khdf/uniproton/core/common/src/devmgr_service_start.c
index 56018a616f392de3e7509abb4707311d8710ce3f..b845b50b6b35bb6a72c54568c8008906fbdeff81 100644
--- a/adapter/khdf/uniproton/core/common/src/devmgr_service_start.c
+++ b/adapter/khdf/uniproton/core/common/src/devmgr_service_start.c
@@ -34,7 +34,7 @@
 #include "devsvc_manager_clnt.h"
 #include "hdf_base.h"
 #include "hdf_io_service.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_sbuf.h"
 
 #define DEV_MGR_NODE_PERM 0660
diff --git a/adapter/khdf/uniproton/core/common/src/hdf_device_node_ext.c b/adapter/khdf/uniproton/core/common/src/hdf_device_node_ext.c
index c1b3bd14316a00b7928483c2539c5490ea4a56f7..29dda6a3907c40aa3e596d4e0cc4b2b18b93aca4 100644
--- a/adapter/khdf/uniproton/core/common/src/hdf_device_node_ext.c
+++ b/adapter/khdf/uniproton/core/common/src/hdf_device_node_ext.c
@@ -30,7 +30,7 @@
 
 #include "hdf_device_node_ext.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 
 #define HDF_LOG_TAG device_node_ext
diff --git a/adapter/khdf/uniproton/osal/src/osal_mem.c b/adapter/khdf/uniproton/osal/src/osal_mem.c
index 68f7ec7a401e93e94e9ef6f0fda34924e6c56b1d..bbf0619025782491e12b340992282af217adcebf 100644
--- a/adapter/khdf/uniproton/osal/src/osal_mem.c
+++ b/adapter/khdf/uniproton/osal/src/osal_mem.c
@@ -29,7 +29,7 @@
  */
 
 #include "osal_mem.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "prt_mem.h"
 #include "securec.h"
 
diff --git a/adapter/khdf/uniproton/osal/src/osal_mutex.c b/adapter/khdf/uniproton/osal/src/osal_mutex.c
index e811795504bc54b717c1f834d6debb7e46ebc7df..9e69ae9b2db8235eaeb1ae753a78c0b7cad723fa 100644
--- a/adapter/khdf/uniproton/osal/src/osal_mutex.c
+++ b/adapter/khdf/uniproton/osal/src/osal_mutex.c
@@ -29,7 +29,7 @@
  */
 
 #include "osal_mutex.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "prt_config.h"
 #include "prt_sem.h"
 
diff --git a/adapter/khdf/uniproton/osal/src/osal_sem.c b/adapter/khdf/uniproton/osal/src/osal_sem.c
index a599527eb32c6516f1e1105480c71e855a6eeb15..2b1a3bdfb2c63e558bf9adf1ebb07a4b162a01ac 100644
--- a/adapter/khdf/uniproton/osal/src/osal_sem.c
+++ b/adapter/khdf/uniproton/osal/src/osal_sem.c
@@ -31,7 +31,7 @@
 #include "osal_sem.h"
 #include "prt_sem.h"
 #include "prt_config.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG osal_sem
 #define HDF_INVALID_SEM_ID UINT32_MAX
diff --git a/adapter/khdf/uniproton/osal/src/osal_spinlock.c b/adapter/khdf/uniproton/osal/src/osal_spinlock.c
index 0721bd7ac2c342220308418274e7d6c779806688..282977b3c0aca6761edf59c0c46db197368f626c 100644
--- a/adapter/khdf/uniproton/osal/src/osal_spinlock.c
+++ b/adapter/khdf/uniproton/osal/src/osal_spinlock.c
@@ -29,7 +29,7 @@
  */
 
 #include "osal_spinlock.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "prt_sem.h"
 
 #define HDF_LOG_TAG osal_spinlock
diff --git a/adapter/khdf/uniproton/osal/src/osal_thread.c b/adapter/khdf/uniproton/osal/src/osal_thread.c
index d1686ecd6aee111b276e72f9a493482c7fbb3898..0c0d9a36111287b0ff89919c04ce45abd46fa367 100644
--- a/adapter/khdf/uniproton/osal/src/osal_thread.c
+++ b/adapter/khdf/uniproton/osal/src/osal_thread.c
@@ -29,7 +29,7 @@
  */
 
 #include "osal_thread.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "prt_sys_external.h"
 #include "prt_task.h"
 #include "osal_mem.h"
diff --git a/adapter/khdf/uniproton/osal/src/osal_time.c b/adapter/khdf/uniproton/osal/src/osal_time.c
index 45fe0792a7d806cde41b49badaad4bfb7b52eea5..a91712ba7f4b40979a7c7805f54eadc954236503 100644
--- a/adapter/khdf/uniproton/osal/src/osal_time.c
+++ b/adapter/khdf/uniproton/osal/src/osal_time.c
@@ -30,7 +30,7 @@
 
 #include "osal_time.h"
 #include <time.h>
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "prt_config.h"
 #include "prt_tick.h"
 #include "prt_task.h"
diff --git a/adapter/khdf/uniproton/osal/src/osal_timer.c b/adapter/khdf/uniproton/osal/src/osal_timer.c
index 707fd9a2a2d836b251c7aa8195d740fe12a77246..9d848a3f27dc9441b26892e9c88ef0f4bdbf1c6b 100644
--- a/adapter/khdf/uniproton/osal/src/osal_timer.c
+++ b/adapter/khdf/uniproton/osal/src/osal_timer.c
@@ -29,7 +29,7 @@
  */
 
 #include "osal_timer.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "prt_timer.h"
 #include "osal_mem.h"
 
diff --git a/adapter/khdf/uniproton/test/sample_driver/src/gpio_test.c b/adapter/khdf/uniproton/test/sample_driver/src/gpio_test.c
index ac6fbbe24ce54639391ab3df261c6035621bf290..ef0f5f23070c6ac4f87f022de498e4093ce4b3f1 100644
--- a/adapter/khdf/uniproton/test/sample_driver/src/gpio_test.c
+++ b/adapter/khdf/uniproton/test/sample_driver/src/gpio_test.c
@@ -31,7 +31,7 @@
 #include <stdio.h>
 
 #include "gpio_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "prt_task.h"
 #include "stm32f4xx_exti.h"
 #include "gpio_test.h"
diff --git a/adapter/khdf/uniproton/test/sample_driver/src/hdf_test_suit.c b/adapter/khdf/uniproton/test/sample_driver/src/hdf_test_suit.c
index f83d15109807f81519902de135ead34699ad7058..68ce1ec9f9028150de90939b9ff10b63e60771dd 100644
--- a/adapter/khdf/uniproton/test/sample_driver/src/hdf_test_suit.c
+++ b/adapter/khdf/uniproton/test/sample_driver/src/hdf_test_suit.c
@@ -29,7 +29,7 @@
  */
 
 #include <stdio.h>
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_platform_entry_test.h"
 #include "platform_device_test.h"
 #include "platform_manager_test.h"
diff --git a/adapter/khdf/uniproton/test/sample_driver/src/i2c_test.c b/adapter/khdf/uniproton/test/sample_driver/src/i2c_test.c
index 9e8001aff935d1e62b65867446c1a0f6526f5b64..0ac0f70abf74d56f2257d9a7f6b74b653365b66b 100644
--- a/adapter/khdf/uniproton/test/sample_driver/src/i2c_test.c
+++ b/adapter/khdf/uniproton/test/sample_driver/src/i2c_test.c
@@ -31,7 +31,7 @@
 #include <stdio.h>
 
 #include "i2c_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "prt_task.h"
 #include "i2c_test.h"
 
diff --git a/adapter/platform/can/can_virtual.c b/adapter/platform/can/can_virtual.c
index 43c31eab03307373275fe374808571a6483c1d4d..31b84c96d7e2f87a23fdebdc14aaa38b77b7825c 100644
--- a/adapter/platform/can/can_virtual.c
+++ b/adapter/platform/can/can_virtual.c
@@ -10,7 +10,7 @@
 
 #include "can/can_core.h"
 #include "device_resource_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 
 #define HDF_LOG_TAG             can_virtual_c
diff --git a/adapter/platform/gpio/gpio_asr.c b/adapter/platform/gpio/gpio_asr.c
index 195ffe822f635cf001a7b085350e66d2f5a8da08..892563febd636b827054b3d721e38c0750e79f93 100644
--- a/adapter/platform/gpio/gpio_asr.c
+++ b/adapter/platform/gpio/gpio_asr.c
@@ -8,7 +8,7 @@
 
 #include <stdlib.h>
 #include "gpio_core.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_irq.h"
 #ifdef LOSCFG_DRIVERS_HDF_CONFIG_MACRO
 #include "hcs_macro.h"
diff --git a/adapter/platform/gpio/gpio_bes.c b/adapter/platform/gpio/gpio_bes.c
index 3773812faaecad58bdf272ab256f23a359390be0..367a221d178469198641cbcef9d633f714bece51 100755
--- a/adapter/platform/gpio/gpio_bes.c
+++ b/adapter/platform/gpio/gpio_bes.c
@@ -10,7 +10,7 @@
 #include "gpio_core.h"
 #include "hal_gpio.h"
 #include "hal_iomux.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_irq.h"
 #ifdef LOSCFG_DRIVERS_HDF_CONFIG_MACRO
 #include "hcs_macro.h"
diff --git a/adapter/platform/gpio/gpio_gr5xx.c b/adapter/platform/gpio/gpio_gr5xx.c
index 0e60ac199db9205f522c781fcc05ff3eeb548737..e1efdb8d17d04b00f8725d3cae0673fd6a678c15 100644
--- a/adapter/platform/gpio/gpio_gr5xx.c
+++ b/adapter/platform/gpio/gpio_gr5xx.c
@@ -11,7 +11,7 @@
 #include "gpio/gpio_core.h"
 #include "device_resource_if.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "stdio.h"
 
 #define HDF_LOG_TAG        gpio_gr5xx
diff --git a/adapter/platform/gpio/gpio_stm32f4xx.c b/adapter/platform/gpio/gpio_stm32f4xx.c
index a2cd8a86eadf9e7b028730e102164388911673db..a06907b778e8f91fe72ae5c2ee342baab9cb29c2 100644
--- a/adapter/platform/gpio/gpio_stm32f4xx.c
+++ b/adapter/platform/gpio/gpio_stm32f4xx.c
@@ -16,7 +16,7 @@
 #include "device_resource_if.h"
 #endif
 #include "gpio_core.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_irq.h"
 
 #define HDF_LOG_TAG gpio_stm_c
diff --git a/adapter/platform/gpio/gpio_wm.c b/adapter/platform/gpio/gpio_wm.c
index 8e2a39bd22287ed7228f3f44034b0d078a765bbf..3d1b9c01892c6fbea9075c0dfe77925cfd90e5b9 100755
--- a/adapter/platform/gpio/gpio_wm.c
+++ b/adapter/platform/gpio/gpio_wm.c
@@ -11,7 +11,7 @@
 #include "gpio_if.h"
 #include "device_resource_if.h"
 #include "osal_irq.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "wm_io.h"
 #include "wm_gpio.h"
 
diff --git a/adapter/platform/i2c/i2c_bes.c b/adapter/platform/i2c/i2c_bes.c
index 8c34538c65eb7712cf0c7a7074f38bad7cde1f99..cbb23a4afa7521cab49e137bf1ce006a2fd0a486 100755
--- a/adapter/platform/i2c/i2c_bes.c
+++ b/adapter/platform/i2c/i2c_bes.c
@@ -12,7 +12,7 @@
 #include "i2c_core.h"
 #include "i2c_if.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #ifdef LOSCFG_DRIVERS_HDF_CONFIG_MACRO
 #include "hcs_macro.h"
 #include "hdf_config_macro.h"
diff --git a/adapter/platform/i2c/i2c_stm32f4xx.c b/adapter/platform/i2c/i2c_stm32f4xx.c
index 879dd2ed0178ed1223c835cc8a80db033929e9ec..da0154804c7a77ed31756b60fb6be4056e5e1ce1 100644
--- a/adapter/platform/i2c/i2c_stm32f4xx.c
+++ b/adapter/platform/i2c/i2c_stm32f4xx.c
@@ -14,7 +14,7 @@
 #include "device_resource_if.h"
 #endif
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "i2c_core.h"
 #include "i2c_if.h"
 #include "osal_mutex.h"
diff --git a/adapter/platform/mipi_dsi/mipi_drm_imx8mm.c b/adapter/platform/mipi_dsi/mipi_drm_imx8mm.c
index 8388adbacb11d7f719b0827342bf25136294b118..4a643ab56e76d7c2303e23532ef501f97d232a61 100644
--- a/adapter/platform/mipi_dsi/mipi_drm_imx8mm.c
+++ b/adapter/platform/mipi_dsi/mipi_drm_imx8mm.c
@@ -11,7 +11,7 @@
 #include <linux/of.h>
 #include "hdf_base.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "mipi_dsi_core.h"
 #include "mipi_dsi_if.h"
 #include "osal_time.h"
diff --git a/adapter/platform/pwm/pwm_bes.c b/adapter/platform/pwm/pwm_bes.c
index 60fd9de7cf641b08e05183a40152576fe357e670..82196c652d24b8d4cd5d8beef90b6f61c57dd388 100755
--- a/adapter/platform/pwm/pwm_bes.c
+++ b/adapter/platform/pwm/pwm_bes.c
@@ -13,7 +13,7 @@
 #include "hal_trace.h"
 #include "hal_timer.h"
 #include "pwm_core.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #ifdef LOSCFG_DRIVERS_HDF_CONFIG_MACRO
 #include "hcs_macro.h"
 #include "hdf_config_macro.h"
diff --git a/adapter/platform/pwm/pwm_stm32f4xx.c b/adapter/platform/pwm/pwm_stm32f4xx.c
index 563efe71122f7cd7a659b6f8adc426b9a43424e6..5affaddb9b11d41a39dd8f04702eac74fb888406 100644
--- a/adapter/platform/pwm/pwm_stm32f4xx.c
+++ b/adapter/platform/pwm/pwm_stm32f4xx.c
@@ -16,7 +16,7 @@
 #endif
 #include "hdf_device_desc.h"
 #include "pwm_core.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_base_hal.h"
 #include "stm32f4xx_ll_tim.h"
 
diff --git a/adapter/platform/pwm/pwm_wm.c b/adapter/platform/pwm/pwm_wm.c
index c9eb43987cba1ad52429a6548934feb1baa131bd..695785da2c623e87daafc7c02e23155c6c4fb812 100755
--- a/adapter/platform/pwm/pwm_wm.c
+++ b/adapter/platform/pwm/pwm_wm.c
@@ -11,7 +11,7 @@
 #include "device_resource_if.h"
 #include "hdf_device_desc.h"
 #include "pwm_core.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "wm_pwm.h"
 
 struct PwmResource {
diff --git a/adapter/platform/spi/spi_bes.c b/adapter/platform/spi/spi_bes.c
index 742d9a9929984326a7ff414db13fdc71f622e30e..02b659909c9837219385d402017a7ca5397af908 100755
--- a/adapter/platform/spi/spi_bes.c
+++ b/adapter/platform/spi/spi_bes.c
@@ -12,7 +12,7 @@
 #include "spi_core.h"
 #include "hal_cache.h"
 #include "hal_trace.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #ifdef LOSCFG_DRIVERS_HDF_CONFIG_MACRO
 #include "hcs_macro.h"
 #include "hdf_config_macro.h"
diff --git a/adapter/platform/spi/spi_stm32f4xx.c b/adapter/platform/spi/spi_stm32f4xx.c
index 735ed4fa152e03f985c109bbfbb04cfcfc44aa2c..1d8fb8bf713d48e2ed2f2377cbde08158aadc5f6 100644
--- a/adapter/platform/spi/spi_stm32f4xx.c
+++ b/adapter/platform/spi/spi_stm32f4xx.c
@@ -18,7 +18,7 @@
 #include "hdf_config_macro.h"
 #else
 #include "device_resource_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #endif
 #include "hdf_base_hal.h"
 
diff --git a/adapter/platform/spi/spi_wm.c b/adapter/platform/spi/spi_wm.c
index c3fbf4157d486cd977389361abbb8ba64589fae5..2b90afefe5b2e68e29f5abd52b62e99f8b1f5aa5 100755
--- a/adapter/platform/spi/spi_wm.c
+++ b/adapter/platform/spi/spi_wm.c
@@ -8,7 +8,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "spi_core.h"
 #include "spi_if.h"
 #include "device_resource_if.h"
diff --git a/adapter/platform/uart/uart_asr.c b/adapter/platform/uart/uart_asr.c
index fccd4fd5750ba0fc835c19b7d40979a0c4715139..733a1f335198d62a69446a7c6fcb7b1293e130df 100644
--- a/adapter/platform/uart/uart_asr.c
+++ b/adapter/platform/uart/uart_asr.c
@@ -9,7 +9,7 @@
 #include "uart/uart_core.h"
 #include "device_resource_if.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "los_sem.h"
 #include "osal_mem.h"
 #include "duet_pinmux.h"
diff --git a/adapter/platform/uart/uart_bes.c b/adapter/platform/uart/uart_bes.c
index e35351120f0b0ab4929a422b69bbf32fabc43aec..929df99e35ad3ffd9e2473a788659f5970f2ec7a 100755
--- a/adapter/platform/uart/uart_bes.c
+++ b/adapter/platform/uart/uart_bes.c
@@ -19,7 +19,7 @@
 #endif
 #include "hal_trace.h"
 #include "hal_cache.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 
 #define HDF_UART_TMO OSAL_WAIT_FOREVER
diff --git a/adapter/platform/uart/uart_gr5xx.c b/adapter/platform/uart/uart_gr5xx.c
index c9221a983207e42d28412575952633c028bd0d7a..b8ff432d0789af9fdb2ce53ab202a7043e423331 100644
--- a/adapter/platform/uart/uart_gr5xx.c
+++ b/adapter/platform/uart/uart_gr5xx.c
@@ -11,7 +11,7 @@
 #include "uart_if.h"
 #include "device_resource_if.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "los_sem.h"
 #include "osal_mem.h"
 
diff --git a/adapter/platform/uart/uart_stm32f4xx.c b/adapter/platform/uart/uart_stm32f4xx.c
index 366b463adf15f74dd1a009a81bf139187665081a..444a39e2b14ed4b038c385361caa1d3c2d2463b8 100644
--- a/adapter/platform/uart/uart_stm32f4xx.c
+++ b/adapter/platform/uart/uart_stm32f4xx.c
@@ -20,7 +20,7 @@
 #else
 #include "device_resource_if.h"
 #endif
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_UART_TMO 1000
 #define HDF_LOG_TAG uartDev
diff --git a/adapter/platform/uart/uart_wm.c b/adapter/platform/uart/uart_wm.c
index f29e44a396c0085874ac4545cbf25ed3721a4d75..94c77bcc45eb90c0ac74e97beb0f0e31babac802 100755
--- a/adapter/platform/uart/uart_wm.c
+++ b/adapter/platform/uart/uart_wm.c
@@ -10,7 +10,7 @@
 #include "osal_time.h"
 #include "osal_sem.h"
 #include "device_resource_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "wm_gpio_afsel.h"
 #include "uart_if.h"
 #include "uart_core.h"
diff --git a/adapter/platform/watchdog/watchdog_bes.c b/adapter/platform/watchdog/watchdog_bes.c
index 4b53a95cb52275b1e7e1071b2d6134f2eaefa0de..d19c4e23b79542a91fa6df50f03dbd44df6cf206 100755
--- a/adapter/platform/watchdog/watchdog_bes.c
+++ b/adapter/platform/watchdog/watchdog_bes.c
@@ -11,7 +11,7 @@
 #include <stdio.h>
 #include "device_resource_if.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hal_trace.h"
 #include "hal_sleep.h"
 #include "watchdog_if.h"
diff --git a/adapter/platform/watchdog/watchdog_stm32f4xx.c b/adapter/platform/watchdog/watchdog_stm32f4xx.c
index 5807f970a1d0af27c3e0b38590f8d4e96193a07f..357ef55077d6113173d515e07627666a3124e42c 100644
--- a/adapter/platform/watchdog/watchdog_stm32f4xx.c
+++ b/adapter/platform/watchdog/watchdog_stm32f4xx.c
@@ -15,7 +15,7 @@
 #include "device_resource_if.h"
 #endif
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "watchdog_core.h"
 #include "watchdog_if.h"
 
diff --git a/adapter/platform/watchdog/watchdog_wm.c b/adapter/platform/watchdog/watchdog_wm.c
index 3d3103416105934d0faee3100d372cef23498c7d..362fc060506ae3743650d5983ef1b13d176ed1e7 100755
--- a/adapter/platform/watchdog/watchdog_wm.c
+++ b/adapter/platform/watchdog/watchdog_wm.c
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include "device_resource_if.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "watchdog_if.h"
 #include "watchdog_core.h"
 #include "wm_regs.h"
diff --git a/adapter/uhdf2/hdi/src/buffer_util.c b/adapter/uhdf2/hdi/src/buffer_util.c
index 865ad9dd03bb0df6d913a25cb46ff825025b7acc..c0be8332e879fbe872bf9155ee55b845708605e5 100644
--- a/adapter/uhdf2/hdi/src/buffer_util.c
+++ b/adapter/uhdf2/hdi/src/buffer_util.c
@@ -15,7 +15,7 @@
 
 #include "base/buffer_util.h"
 #include <unistd.h>
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "securec.h"
 
diff --git a/adapter/uhdf2/hdi/src/devmgr_client.c b/adapter/uhdf2/hdi/src/devmgr_client.c
index 3386ca944936eb97ae831928d8fce668dcd94c29..f832ce2b0c4f9bb77afabf235ecd5e8fb666edb3 100644
--- a/adapter/uhdf2/hdi/src/devmgr_client.c
+++ b/adapter/uhdf2/hdi/src/devmgr_client.c
@@ -20,7 +20,7 @@
  */
 #include <devmgr_service_stub.h>
 #include <hdf_base.h>
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include <hdf_remote_service.h>
 #include <osal_mem.h>
 #include <servmgr_hdi.h>
diff --git a/adapter/uhdf2/hdi/src/hdi_smq_syncer.cpp b/adapter/uhdf2/hdi/src/hdi_smq_syncer.cpp
index 485931e47ef886d93b1a19bfc65821f8e425ea60..1c9a156bcf6c74a217b0b654ac36bfddd1041718 100644
--- a/adapter/uhdf2/hdi/src/hdi_smq_syncer.cpp
+++ b/adapter/uhdf2/hdi/src/hdi_smq_syncer.cpp
@@ -18,7 +18,7 @@
 #include <ctime>
 #include <datetime_ex.h>
 #include <hdf_base.h>
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include <base/hdi_smq_syncer.h>
 #include <sys/syscall.h>
 #include <unistd.h>
diff --git a/adapter/uhdf2/hdi/src/hdi_support.cpp b/adapter/uhdf2/hdi/src/hdi_support.cpp
index e7080f5fcf5fbbd93ca3769037f54046e86fb31b..8ed562e3e59c960f496490a5d5fc0dd84effa59b 100644
--- a/adapter/uhdf2/hdi/src/hdi_support.cpp
+++ b/adapter/uhdf2/hdi/src/hdi_support.cpp
@@ -24,7 +24,7 @@
 #include <unistd.h>
 
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG load_hdi
 
diff --git a/adapter/uhdf2/hdi/src/idevmgr_client.cpp b/adapter/uhdf2/hdi/src/idevmgr_client.cpp
index 467fb0e1c5fd885ada50675ede9601f1f93e5932..f12bef5fedf0471affb0a37f738688dbe34b18e8 100644
--- a/adapter/uhdf2/hdi/src/idevmgr_client.cpp
+++ b/adapter/uhdf2/hdi/src/idevmgr_client.cpp
@@ -16,7 +16,7 @@
 #include <mutex>
 
 #include <hdf_base.h>
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include <iproxy_broker.h>
 #include <iservice_registry.h>
 #include <object_collector.h>
diff --git a/adapter/uhdf2/hdi/src/iservmgr_client.cpp b/adapter/uhdf2/hdi/src/iservmgr_client.cpp
index d058a5793e10257b9c1b52faec17127d776c5e60..90c53f07d614a56a77a454aa7d75eecb24568661 100644
--- a/adapter/uhdf2/hdi/src/iservmgr_client.cpp
+++ b/adapter/uhdf2/hdi/src/iservmgr_client.cpp
@@ -16,7 +16,7 @@
 #include <mutex>
 
 #include <hdf_base.h>
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include <iproxy_broker.h>
 #include <iremote_stub.h>
 #include <iservice_registry.h>
diff --git a/adapter/uhdf2/hdi/src/native_buffer.cpp b/adapter/uhdf2/hdi/src/native_buffer.cpp
index ff4e1d4acc61920e94edbdc6374e32c62e12395f..221b94b20189504917cad897283cb489ad5a4030 100644
--- a/adapter/uhdf2/hdi/src/native_buffer.cpp
+++ b/adapter/uhdf2/hdi/src/native_buffer.cpp
@@ -16,7 +16,7 @@
 #include "base/native_buffer.h"
 #include <sstream>
 #include "base/buffer_util.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG native_buffer
 
diff --git a/adapter/uhdf2/hdi/src/object_collector.cpp b/adapter/uhdf2/hdi/src/object_collector.cpp
index b7b146a2a4a32a54e1c557629145331326812d4a..2a03106f902b8d287bc08ef17650847193a56790 100644
--- a/adapter/uhdf2/hdi/src/object_collector.cpp
+++ b/adapter/uhdf2/hdi/src/object_collector.cpp
@@ -17,7 +17,7 @@
 #include <iremote_object.h>
 #include <thread>
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_time.h"
 
 using namespace OHOS::HDI;
diff --git a/adapter/uhdf2/hdi/src/servmgr_client.c b/adapter/uhdf2/hdi/src/servmgr_client.c
index 27bba53d3c842ee93f30c349ba624d10fcb63a9d..83252c4130915d93e9304ffcac9dcb23cb8b94af 100644
--- a/adapter/uhdf2/hdi/src/servmgr_client.c
+++ b/adapter/uhdf2/hdi/src/servmgr_client.c
@@ -16,7 +16,7 @@
 #include <devsvc_manager_proxy.h>
 #include <devsvc_manager_stub.h>
 #include <hdf_base.h>
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include <osal_mem.h>
 #include "hdf_cstring.h"
 #include "hdf_service_status.h"
diff --git a/adapter/uhdf2/hdi/src/servstat_listener.c b/adapter/uhdf2/hdi/src/servstat_listener.c
index 996707b2a6ed02056bbdffc850abeb5fb458b087..7f0e1dfad7137617c040a08e24db9862d6cc69df 100644
--- a/adapter/uhdf2/hdi/src/servstat_listener.c
+++ b/adapter/uhdf2/hdi/src/servstat_listener.c
@@ -14,7 +14,7 @@
  */
 
 #include <hdf_dlist.h>
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include <hdf_remote_service.h>
 #include <hdf_service_status_inner.h>
 #include <osal_mem.h>
diff --git a/adapter/uhdf2/hdi/src/servstat_listener_stub.cpp b/adapter/uhdf2/hdi/src/servstat_listener_stub.cpp
index ab4781f01d5bd45916c22b14260bddd40f8ae480..9d8ac76fb9f8697997fabebe4a5489bf0d0a44d6 100644
--- a/adapter/uhdf2/hdi/src/servstat_listener_stub.cpp
+++ b/adapter/uhdf2/hdi/src/servstat_listener_stub.cpp
@@ -14,7 +14,7 @@
  */
 
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_service_status_inner.h"
 #include "iservstat_listener_hdi.h"
 
diff --git a/adapter/uhdf2/hdi/src/stub_collector.cpp b/adapter/uhdf2/hdi/src/stub_collector.cpp
index 2536cb5b2232f40a560762dc30fbfcf1f115b6a0..cee5af8e9c24e3a2c513de62c3760dbee18ea854 100644
--- a/adapter/uhdf2/hdi/src/stub_collector.cpp
+++ b/adapter/uhdf2/hdi/src/stub_collector.cpp
@@ -14,7 +14,7 @@
  */
 
 #include "stub_collector.h"
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include <map>
 #include <mutex>
 
diff --git a/adapter/uhdf2/hdi/test/buffer_handle/native_buffer_test.cpp b/adapter/uhdf2/hdi/test/buffer_handle/native_buffer_test.cpp
index 6c61b0e7935c18edfee9968fd3b61ce7cdf2637c..7ca39aef2dc67ed313da7a66a7a11ccdfdf807dd 100644
--- a/adapter/uhdf2/hdi/test/buffer_handle/native_buffer_test.cpp
+++ b/adapter/uhdf2/hdi/test/buffer_handle/native_buffer_test.cpp
@@ -21,7 +21,7 @@
 #include "base/buffer_util.h"
 #include "base/native_buffer.h"
 #include "osal_mem.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 using namespace testing::ext;
 using OHOS::MessageParcel;
diff --git a/adapter/uhdf2/hdi/test/servmgr/service_manager_hdi_c_test.cpp b/adapter/uhdf2/hdi/test/servmgr/service_manager_hdi_c_test.cpp
index fee9c7e278a1051a5f2962091f64c7b4c3ee8f1f..ed233b5411aeae513f855323f81de361a3dcb6e1 100644
--- a/adapter/uhdf2/hdi/test/servmgr/service_manager_hdi_c_test.cpp
+++ b/adapter/uhdf2/hdi/test/servmgr/service_manager_hdi_c_test.cpp
@@ -16,7 +16,7 @@
 #include <devmgr_hdi.h>
 #include <gtest/gtest.h>
 #include <hdf_io_service_if.h>
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include <hdf_remote_service.h>
 #include <hdf_sbuf.h>
 #include <hdf_service_status.h>
diff --git a/adapter/uhdf2/hdi/test/servmgr/service_manager_hdi_test.cpp b/adapter/uhdf2/hdi/test/servmgr/service_manager_hdi_test.cpp
index d741b168ba8b4da4077bcbbe1e7637873e9590b1..6866244b919c973d98e83ae218b5f47cd61c6c46 100644
--- a/adapter/uhdf2/hdi/test/servmgr/service_manager_hdi_test.cpp
+++ b/adapter/uhdf2/hdi/test/servmgr/service_manager_hdi_test.cpp
@@ -17,7 +17,7 @@
 #include <functional>
 #include <gtest/gtest.h>
 #include <hdf_io_service_if.h>
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include <hdf_service_status_inner.h>
 #include <idevmgr_hdi.h>
 #include <iostream>
diff --git a/adapter/uhdf2/host/devhost.c b/adapter/uhdf2/host/devhost.c
index 0e782eda62c1743ba80dc90af9abd9a31bdbc879..bacd0e35adaa5a5d731b32e7610c9dd46e1dab36 100644
--- a/adapter/uhdf2/host/devhost.c
+++ b/adapter/uhdf2/host/devhost.c
@@ -29,7 +29,7 @@
 #include "devhost_service.h"
 #include "devhost_service_full.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_power_manager.h"
 
 #define HDF_LOG_TAG                    hdf_device_host
diff --git a/adapter/uhdf2/host/src/devhost_dump.c b/adapter/uhdf2/host/src/devhost_dump.c
index b9ef1d73cdd6f0592f6893404161eaa437f583ee..ce5b2eb8dfa3e4ae25814c108ffb398956ac374f 100644
--- a/adapter/uhdf2/host/src/devhost_dump.c
+++ b/adapter/uhdf2/host/src/devhost_dump.c
@@ -18,7 +18,7 @@
 #include "hdf_base.h"
 #include "hdf_cstring.h"
 #include "hdf_dlist.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "osal_mutex.h"
 #include "hdf_dump_reg.h"
diff --git a/adapter/uhdf2/host/src/devhost_object_config.c b/adapter/uhdf2/host/src/devhost_object_config.c
index 0da41a7ac549f749ed7557e122b30705e53af487..fd7bed893d539bc6a8c48f255a4bcd94ff92fd63 100644
--- a/adapter/uhdf2/host/src/devhost_object_config.c
+++ b/adapter/uhdf2/host/src/devhost_object_config.c
@@ -19,7 +19,7 @@
 #include "devsvc_manager_proxy.h"
 #include "driver_loader_full.h"
 #include "device_service_stub.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_object_manager.h"
 
 #define HDF_LOG_TAG devhost_object_config
diff --git a/adapter/uhdf2/host/src/devhost_service_full.c b/adapter/uhdf2/host/src/devhost_service_full.c
index c9331f5ce2950e666e02d66f509f22e27113563c..8a8e692bb9ea102c75553884148fc991dfb39e5c 100644
--- a/adapter/uhdf2/host/src/devhost_service_full.c
+++ b/adapter/uhdf2/host/src/devhost_service_full.c
@@ -18,7 +18,7 @@
 #include "hdf_base.h"
 #include "hdf_device_info.h"
 #include "hdf_device_node.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_message.h"
 #include "power_state_token.h"
 
diff --git a/adapter/uhdf2/host/src/devhost_service_stub.c b/adapter/uhdf2/host/src/devhost_service_stub.c
index 9cf8e183b379f191d4dc8f5eaf8a56e0ffcd2309..c42d044150c152b74b5bf08e8cf02d84508f498b 100644
--- a/adapter/uhdf2/host/src/devhost_service_stub.c
+++ b/adapter/uhdf2/host/src/devhost_service_stub.c
@@ -18,7 +18,7 @@
 #include "devhost_dump.h"
 #include "devhost_service_proxy.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_sbuf.h"
 #include "osal_mem.h"
 
diff --git a/adapter/uhdf2/host/src/device_service_stub.c b/adapter/uhdf2/host/src/device_service_stub.c
index 55ac66fbcee6931632d77b076137a5f7dd1170b3..383a592bf1c3c12734387e8b15a8aa4b6e8a10dc 100644
--- a/adapter/uhdf2/host/src/device_service_stub.c
+++ b/adapter/uhdf2/host/src/device_service_stub.c
@@ -16,7 +16,7 @@
 #include "device_service_stub.h"
 #include "devsvc_manager_clnt.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_sbuf.h"
 #include "osal_mem.h"
 
diff --git a/adapter/uhdf2/host/src/device_token_stub.c b/adapter/uhdf2/host/src/device_token_stub.c
index 87f3c623bdae4907991344d24f11cf00040e7bc4..87e9677974007344c8c2948923c712e38472e580 100644
--- a/adapter/uhdf2/host/src/device_token_stub.c
+++ b/adapter/uhdf2/host/src/device_token_stub.c
@@ -16,7 +16,7 @@
 #include "osal_mem.h"
 #include "device_token_stub.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG device_token_stub
 
diff --git a/adapter/uhdf2/host/src/devmgr_service_proxy.c b/adapter/uhdf2/host/src/devmgr_service_proxy.c
index 7c808f2506097b9fb4836790d62f3e9bbcd2102d..009f1d59f5d0af7d7bb3136d3f72d5c75c2bbfff 100644
--- a/adapter/uhdf2/host/src/devmgr_service_proxy.c
+++ b/adapter/uhdf2/host/src/devmgr_service_proxy.c
@@ -19,7 +19,7 @@
 #include "devmgr_service_stub.h"
 #include "devsvc_manager_clnt.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_sbuf.h"
 #include "osal_mem.h"
 
diff --git a/adapter/uhdf2/host/src/devsvc_manager_proxy.c b/adapter/uhdf2/host/src/devsvc_manager_proxy.c
index 69fa1efe0f023a98c5338ddcab4f61bc75d8d6b7..8e6efd30eba4ce2b60563c118a78610f80035caa 100644
--- a/adapter/uhdf2/host/src/devsvc_manager_proxy.c
+++ b/adapter/uhdf2/host/src/devsvc_manager_proxy.c
@@ -19,7 +19,7 @@
 #include "device_service_stub.h"
 #include "devsvc_manager_stub.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_sbuf.h"
 #include "osal_mem.h"
 #include <unistd.h>
diff --git a/adapter/uhdf2/host/src/driver_loader_full.c b/adapter/uhdf2/host/src/driver_loader_full.c
index ed55d4110b5c0e9161aa0d4fe00682b3536a137e..e552bcf641a00d1ab19cc23d9bb1ce5bee6b5bd5 100644
--- a/adapter/uhdf2/host/src/driver_loader_full.c
+++ b/adapter/uhdf2/host/src/driver_loader_full.c
@@ -21,7 +21,7 @@
 
 #include "securec.h"
 
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_object_manager.h"
 #include "osal_mem.h"
 
diff --git a/adapter/uhdf2/host/src/hdf_device_thread.c b/adapter/uhdf2/host/src/hdf_device_thread.c
index 60a8cf3f995d5c57b22e08304816fc9727e069a2..c6f5001b3f0f3a869ced4ac06a9c1c7ae7f83760 100644
--- a/adapter/uhdf2/host/src/hdf_device_thread.c
+++ b/adapter/uhdf2/host/src/hdf_device_thread.c
@@ -14,7 +14,7 @@
  */
 
 #include "hdf_device_thread.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "osal_message.h"
 
diff --git a/adapter/uhdf2/host/test/BUILD.gn b/adapter/uhdf2/host/test/BUILD.gn
index 05bf9dbe305e4e9e0ab00f1fe0c50163825a520d..3b05c93f46b7866530fb5db0e4a96075f341b73c 100644
--- a/adapter/uhdf2/host/test/BUILD.gn
+++ b/adapter/uhdf2/host/test/BUILD.gn
@@ -79,6 +79,8 @@ ohos_unittest("DevHostTest") {
     "$hdf_uhdf_path/ipc/include",
   ]
 
+  defines = [ "__USER__" ]
+
   deps = [
     "$hdf_uhdf_path/host:libhdf_host",
     "$hdf_uhdf_path/ipc:libhdf_ipc_adapter",
diff --git a/adapter/uhdf2/host/test/unittest/devhost_test.cpp b/adapter/uhdf2/host/test/unittest/devhost_test.cpp
index 81384ea0165fb04518d81382d4fd8e479b4e9b5a..a249d4814f6be6492436aff03d54d1cc9340a23e 100644
--- a/adapter/uhdf2/host/test/unittest/devhost_test.cpp
+++ b/adapter/uhdf2/host/test/unittest/devhost_test.cpp
@@ -29,7 +29,7 @@
 #include "hdf_device.h"
 #include "hdf_device_node.h"
 #include "hdf_remote_service.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_sbuf.h"
 #include "osal_mem.h"
 #include "hdf_device_object.h"
diff --git a/adapter/uhdf2/host/test/unittest/sample1_driver/sample1_driver.c b/adapter/uhdf2/host/test/unittest/sample1_driver/sample1_driver.c
index 26bd5d12e501d1c1b5e2dccfd66f2838d1c97618..3e3fd7bc00f3f2780e310589484999a23e796a1b 100755
--- a/adapter/uhdf2/host/test/unittest/sample1_driver/sample1_driver.c
+++ b/adapter/uhdf2/host/test/unittest/sample1_driver/sample1_driver.c
@@ -17,7 +17,7 @@
 #include "hdf_base.h"
 #include "hdf_device_desc.h"
 #include "hdf_device_object.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "power_state_token.h"
 
 #define HDF_LOG_TAG sample1_driver
diff --git a/adapter/uhdf2/host/test/unittest/sample_driver/sample_driver.cpp b/adapter/uhdf2/host/test/unittest/sample_driver/sample_driver.cpp
index c8f9700833e8de45655ee266d6f47c77d137e3ea..bb7da10222874cac5f11875ad5189929125c5127 100644
--- a/adapter/uhdf2/host/test/unittest/sample_driver/sample_driver.cpp
+++ b/adapter/uhdf2/host/test/unittest/sample_driver/sample_driver.cpp
@@ -16,7 +16,7 @@
 #include <devhost_dump_reg.h>
 #include <hdf_device_desc.h>
 #include <hdf_device_object.h>
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include "sample_hdi.h"
 
 #define HDF_LOG_TAG sample_driver
diff --git a/adapter/uhdf2/host/test/unittest/sample_driver/sample_hdi.h b/adapter/uhdf2/host/test/unittest/sample_driver/sample_hdi.h
index 4906b73ffab4283b5c21312c34ebff4f13bc717a..84d76279b370bceddde26e3b1ab0d8ecf4f2c15b 100644
--- a/adapter/uhdf2/host/test/unittest/sample_driver/sample_hdi.h
+++ b/adapter/uhdf2/host/test/unittest/sample_driver/sample_hdi.h
@@ -17,7 +17,7 @@
 #define SAMPLE_SERVICE_HDF_H
 
 #include <hdf_sbuf.h>
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include <osal_mem.h>
 #include <securec.h>
 #include <base/hdi_smq_meta.h>
diff --git a/adapter/uhdf2/host/test/unittest/sample_driver/sample_hdi_service.cpp b/adapter/uhdf2/host/test/unittest/sample_driver/sample_hdi_service.cpp
index 0762bd20cb00cef90e4ddfac61a4d7f095505e91..3498a0e162ea78c467129c3b24d53fa51c845c0b 100644
--- a/adapter/uhdf2/host/test/unittest/sample_driver/sample_hdi_service.cpp
+++ b/adapter/uhdf2/host/test/unittest/sample_driver/sample_hdi_service.cpp
@@ -17,7 +17,7 @@
 #include <devhost_service_full.h>
 #include <hdf_device_object.h>
 #include <hdf_dlist.h>
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include <hdf_power_state.h>
 #include <hdf_remote_service.h>
 #include <thread>
diff --git a/adapter/uhdf2/host/test/unittest/sample_driver/sample_hdi_service_stub.cpp b/adapter/uhdf2/host/test/unittest/sample_driver/sample_hdi_service_stub.cpp
index 9c601e4026a0cdf21571dc69418c5bcfcd2df52d..d2c61bbf68a4f5cea8f2e01db9c87766ccdd8bd0 100644
--- a/adapter/uhdf2/host/test/unittest/sample_driver/sample_hdi_service_stub.cpp
+++ b/adapter/uhdf2/host/test/unittest/sample_driver/sample_hdi_service_stub.cpp
@@ -15,7 +15,7 @@
 
 #include <hdf_device_desc.h>
 #include <hdf_device_object.h>
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include <message_parcel.h>
 #include <osal_mem.h>
 
diff --git a/adapter/uhdf2/ipc/src/hdf_dump.cpp b/adapter/uhdf2/ipc/src/hdf_dump.cpp
index 3cea8189294a5f954788c22f7608e39376e6a049..04c4c230aa9b28733928dd77a4eb452880ea2ff0 100644
--- a/adapter/uhdf2/ipc/src/hdf_dump.cpp
+++ b/adapter/uhdf2/ipc/src/hdf_dump.cpp
@@ -23,7 +23,7 @@
 
 #include "hdf_base.h"
 #include "hdf_dump_reg.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_sbuf.h"
 #include "securec.h"
 
diff --git a/adapter/uhdf2/ipc/src/hdf_remote_adapter.cpp b/adapter/uhdf2/ipc/src/hdf_remote_adapter.cpp
index 84066fbddd5effb7accf3a80140486ad6aa47d78..a29a9f290ac2eb2bb2214576596fbfd0705cd607 100644
--- a/adapter/uhdf2/ipc/src/hdf_remote_adapter.cpp
+++ b/adapter/uhdf2/ipc/src/hdf_remote_adapter.cpp
@@ -21,7 +21,7 @@
 #include <vector>
 
 #include "hdf_dump.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_object_manager.h"
 #include "hdf_sbuf_ipc.h"
 #include "hdf_remote_adapter.h"
diff --git a/adapter/uhdf2/ipc/src/hdf_sbuf_impl_hipc.cpp b/adapter/uhdf2/ipc/src/hdf_sbuf_impl_hipc.cpp
index 0971f435cc1f4c4c511d66130c1b796d27357883..b926a7e44de45f3a74e2ffb720fa6c481d4e2ae0 100644
--- a/adapter/uhdf2/ipc/src/hdf_sbuf_impl_hipc.cpp
+++ b/adapter/uhdf2/ipc/src/hdf_sbuf_impl_hipc.cpp
@@ -17,7 +17,7 @@
 #include <string>
 #include "hdf_sbuf_ipc.h"
 #include "hdf_sbuf_impl.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_remote_adapter.h"
 
 using namespace OHOS;
diff --git a/adapter/uhdf2/manager/device_manager.c b/adapter/uhdf2/manager/device_manager.c
index 30a0a4ea946fe349bf3dbbcee547d08d8ec99366..30fadc8e37b8190f69f80b8c51492f69d29fd7e3 100644
--- a/adapter/uhdf2/manager/device_manager.c
+++ b/adapter/uhdf2/manager/device_manager.c
@@ -17,7 +17,7 @@
 #include "devmgr_service_full.h"
 #include "devmgr_uevent.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "devmgr_dump.h"
 #include "parameter.h"
 
diff --git a/adapter/uhdf2/manager/src/devhost_service_proxy.c b/adapter/uhdf2/manager/src/devhost_service_proxy.c
index fbb783292a9c9aea415cc641a1ce0ab4f4cb2713..76f037684ad3f0ca9e2d241e42ae359c7209d27b 100644
--- a/adapter/uhdf2/manager/src/devhost_service_proxy.c
+++ b/adapter/uhdf2/manager/src/devhost_service_proxy.c
@@ -17,7 +17,7 @@
 #include "dev_attribute_serialize.h"
 #include "devmgr_service_full.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_sbuf.h"
 #include "osal_mem.h"
 #include "osal_message.h"
diff --git a/adapter/uhdf2/manager/src/devmgr_dump.c b/adapter/uhdf2/manager/src/devmgr_dump.c
index e2eccf70c2bbc2d464b9e8d69eb615bd3f34f62c..a694f403a7aa831d688b5d20c2c290eca75ec727 100644
--- a/adapter/uhdf2/manager/src/devmgr_dump.c
+++ b/adapter/uhdf2/manager/src/devmgr_dump.c
@@ -24,7 +24,7 @@
 #include "hdf_dlist.h"
 #include "hdf_dump_reg.h"
 #include "hdf_io_service.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_sbuf.h"
 #include "devmgr_dump.h"
 
diff --git a/adapter/uhdf2/manager/src/devmgr_object_config.c b/adapter/uhdf2/manager/src/devmgr_object_config.c
index 5e157c1c102df56d7b6bbeaf9050e144d61d16c3..1b49c76fe56c4b4c02ae4e13597c0595be2b1e93 100644
--- a/adapter/uhdf2/manager/src/devmgr_object_config.c
+++ b/adapter/uhdf2/manager/src/devmgr_object_config.c
@@ -17,7 +17,7 @@
 #include "devmgr_service_stub.h"
 #include "devsvc_manager_stub.h"
 #include "driver_installer_full.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG devmgr_object_config
 
diff --git a/adapter/uhdf2/manager/src/devmgr_query_device.c b/adapter/uhdf2/manager/src/devmgr_query_device.c
index c8ab409f140b4a6842e243743238b05862735aae..a3738fe0fe65609f90594a65c21c61f2d7936b2c 100644
--- a/adapter/uhdf2/manager/src/devmgr_query_device.c
+++ b/adapter/uhdf2/manager/src/devmgr_query_device.c
@@ -16,7 +16,7 @@
 #include "devhost_service_clnt.h"
 #include "devmgr_service.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_sbuf.h"
 
 #define HDF_LOG_TAG devmgr_query_device
diff --git a/adapter/uhdf2/manager/src/devmgr_service_full.c b/adapter/uhdf2/manager/src/devmgr_service_full.c
index 6bf0bf4d0cf77d4628686f598b33bb0b9df042dd..55292bdb3f4dfee904340fd4b67f5c02b28dd57e 100644
--- a/adapter/uhdf2/manager/src/devmgr_service_full.c
+++ b/adapter/uhdf2/manager/src/devmgr_service_full.c
@@ -18,7 +18,7 @@
 #include "devhost_service_proxy.h"
 #include "device_token_clnt.h"
 #include "hdf_driver_installer.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_message_looper.h"
 #include "osal_message.h"
 
diff --git a/adapter/uhdf2/manager/src/devmgr_service_stub.c b/adapter/uhdf2/manager/src/devmgr_service_stub.c
index e4ec2609c78d4ea26db128001a199dd85f6e5aaa..ee664da886dbcb14c3e6f35b76a3cfda9396aff5 100644
--- a/adapter/uhdf2/manager/src/devmgr_service_stub.c
+++ b/adapter/uhdf2/manager/src/devmgr_service_stub.c
@@ -25,7 +25,7 @@
 #include "devmgr_query_device.h"
 #include "devsvc_manager.h"
 #include "hdf_cstring.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_sbuf.h"
 #include "osal_mem.h"
 #include "osal_sysevent.h"
diff --git a/adapter/uhdf2/manager/src/devmgr_uevent.c b/adapter/uhdf2/manager/src/devmgr_uevent.c
index 47dbcca04004bbb49851ea4ff2dfe2922d0cd5ad..fc8db513584872805c6bbaac16ad0404ceb627b2 100644
--- a/adapter/uhdf2/manager/src/devmgr_uevent.c
+++ b/adapter/uhdf2/manager/src/devmgr_uevent.c
@@ -22,7 +22,7 @@
 
 #include "devmgr_service.h"
 #include "hdf_dlist.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "osal_thread.h"
 #include "osal_time.h"
diff --git a/adapter/uhdf2/manager/src/devsvc_manager_stub.c b/adapter/uhdf2/manager/src/devsvc_manager_stub.c
index cacf2c5cca7caf051b129960a27f8ff5191a18e3..ca14c9da7de51208226722515fcaafacdc201f66 100644
--- a/adapter/uhdf2/manager/src/devsvc_manager_stub.c
+++ b/adapter/uhdf2/manager/src/devsvc_manager_stub.c
@@ -23,7 +23,7 @@
 #include "devsvc_listener_holder.h"
 #include "devsvc_manager_proxy.h"
 #include "hdf_cstring.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_remote_service.h"
 #include "hdf_sbuf.h"
 #include "hdf_slist.h"
diff --git a/adapter/uhdf2/manager/src/driver_installer_full.c b/adapter/uhdf2/manager/src/driver_installer_full.c
index 6778367ed3a70f711d51560fae9ac1e05cae05b3..26ca2fce854118eb7f7f0bc62ff9789cea5b3b2f 100644
--- a/adapter/uhdf2/manager/src/driver_installer_full.c
+++ b/adapter/uhdf2/manager/src/driver_installer_full.c
@@ -16,7 +16,7 @@
 #include "driver_installer_full.h"
 #include "hdf_base.h"
 #include "hdf_driver_installer.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "service_control.h"
 
diff --git a/adapter/uhdf2/manager/src/servstat_listener_holder.c b/adapter/uhdf2/manager/src/servstat_listener_holder.c
index f21d1d27b1dd2d3e9579b2cc4d432f1432d79e63..59039ec27d0eb2658155eefbb4f4fb3a6055101f 100644
--- a/adapter/uhdf2/manager/src/servstat_listener_holder.c
+++ b/adapter/uhdf2/manager/src/servstat_listener_holder.c
@@ -17,7 +17,7 @@
 #include "hdf_remote_service.h"
 #include "osal_mem.h"
 #include "osal_mutex.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG servstat
 
diff --git a/adapter/uhdf2/osal/src/osal_sysevent.c b/adapter/uhdf2/osal/src/osal_sysevent.c
index 1ea982e8418f3613949b58590c298071e3515fef..16f8d290fc23fbad17258c7590827c8426ea028b 100644
--- a/adapter/uhdf2/osal/src/osal_sysevent.c
+++ b/adapter/uhdf2/osal/src/osal_sysevent.c
@@ -15,7 +15,7 @@
 
 #include "osal_sysevent.h"
 #include "hdf_io_service_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "osal_mutex.h"
 
diff --git a/adapter/uhdf2/osal/test/unittest/common/osal_slist_test.cpp b/adapter/uhdf2/osal/test/unittest/common/osal_slist_test.cpp
index ccdd4e893e43109f09ce6ba0336c1fb393f806a9..68bab3a2d5d67d94590aa3bf616432bbbef66156 100644
--- a/adapter/uhdf2/osal/test/unittest/common/osal_slist_test.cpp
+++ b/adapter/uhdf2/osal/test/unittest/common/osal_slist_test.cpp
@@ -17,7 +17,7 @@
 #include <unistd.h>
 #include <vector>
 #include <gtest/gtest.h>
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_slist.h"
 #include "osal_mem.h"
 #include "securec.h"
diff --git a/adapter/uhdf2/osal/test/unittest/common/sample_driver.c b/adapter/uhdf2/osal/test/unittest/common/sample_driver.c
index 5a80c731254c74172fab3e141c3906451ca7a18c..fde70cf43525e30a53f86154663a9798aac77056 100644
--- a/adapter/uhdf2/osal/test/unittest/common/sample_driver.c
+++ b/adapter/uhdf2/osal/test/unittest/common/sample_driver.c
@@ -15,7 +15,7 @@
 
 #include "sample_driver.h"
 #include <linux/ioctl.h>
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_base.h"
 #include "hdf_device_desc.h"
 
diff --git a/adapter/uhdf2/security/src/hdf_security.c b/adapter/uhdf2/security/src/hdf_security.c
index 4ed3e42343ea08df9c4cec32526dccace174dd20..218d62d2d93f909fc584da63df3a8d60462c7a7d 100644
--- a/adapter/uhdf2/security/src/hdf_security.c
+++ b/adapter/uhdf2/security/src/hdf_security.c
@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include "hcs_tree_if.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_sec.h"
 #include "pal_if.h"
 #include "securec.h"
diff --git a/adapter/uhdf2/shared/src/dev_attribute_serialize.c b/adapter/uhdf2/shared/src/dev_attribute_serialize.c
index f8658ee613fc1237a394ef2efa621fafdb3568f8..d8eea9c7a9a1de8df36836c1fea08b8720875b68 100644
--- a/adapter/uhdf2/shared/src/dev_attribute_serialize.c
+++ b/adapter/uhdf2/shared/src/dev_attribute_serialize.c
@@ -14,7 +14,7 @@
  */
 
 #include "dev_attribute_serialize.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 
 #define HDF_LOG_TAG dev_attr_serialze
diff --git a/adapter/uhdf2/shared/src/hcb_config_entry.c b/adapter/uhdf2/shared/src/hcb_config_entry.c
index ae6b8161f3b044acce3232cb4513b695a474b754..43a0e951a4323113eb2feb9bbe9272c1a4e79c6c 100644
--- a/adapter/uhdf2/shared/src/hcb_config_entry.c
+++ b/adapter/uhdf2/shared/src/hcb_config_entry.c
@@ -18,7 +18,7 @@
 #include "hcs_dm_parser.h"
 #include "hcs_tree_if.h"
 #include "hdf_attribute_manager.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG attribute_manager
 
diff --git a/adapter/uhdf2/utils/src/hcs_parser/hcs_blob_load.c b/adapter/uhdf2/utils/src/hcs_parser/hcs_blob_load.c
index 30ea43364d0c4a4c177fdad0e75b097864fbf026..7f4104f1e70b7c32e2497678c9dbb2db903173d8 100644
--- a/adapter/uhdf2/utils/src/hcs_parser/hcs_blob_load.c
+++ b/adapter/uhdf2/utils/src/hcs_parser/hcs_blob_load.c
@@ -17,7 +17,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "hcs_blob_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 
 #define HDF_LOG_TAG hcs_blob_load
diff --git a/adapter/uhdf2/utils/src/hcs_parser/hcs_dm_parser.c b/adapter/uhdf2/utils/src/hcs_parser/hcs_dm_parser.c
index f5ec17e5aae1c902c76f12d5f7df97192bd1151a..8928dbaa44df45c0c61a489db1c22dce9838731e 100644
--- a/adapter/uhdf2/utils/src/hcs_parser/hcs_dm_parser.c
+++ b/adapter/uhdf2/utils/src/hcs_parser/hcs_dm_parser.c
@@ -18,7 +18,7 @@
 #include "hcs_blob_if.h"
 #include "hcs_blob_load.h"
 #include "hcs_parser.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 
 #define HDF_LOG_TAG hcs_dm_parser
diff --git a/adapter/uhdf2/utils/src/hdf_xcollie.cpp b/adapter/uhdf2/utils/src/hdf_xcollie.cpp
index 26413948a800302d1b49923c7020ef3fbed294ec..0b3f9224736ab114de1779fe9c2178da97d41eda 100644
--- a/adapter/uhdf2/utils/src/hdf_xcollie.cpp
+++ b/adapter/uhdf2/utils/src/hdf_xcollie.cpp
@@ -14,7 +14,7 @@
  */
 #include <unistd.h>
 #include "hdf_xcollie.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 namespace OHOS {
 #ifdef HDFHICOLLIE_ENABLE
diff --git a/framework/core/adapter/syscall/src/hdf_devmgr_adapter.c b/framework/core/adapter/syscall/src/hdf_devmgr_adapter.c
index 2f6e032b216e7efbd4e77a56975c24b06c7a6484..0a17e4d2770d666bd479e188f22e5c8a2b68b757 100644
--- a/framework/core/adapter/syscall/src/hdf_devmgr_adapter.c
+++ b/framework/core/adapter/syscall/src/hdf_devmgr_adapter.c
@@ -8,7 +8,7 @@
 
 #include "hdf_base.h"
 #include "hdf_io_service.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_sbuf.h"
 
 #define HDF_LOG_TAG hdf_devmgr_adapter
diff --git a/framework/core/adapter/syscall/src/hdf_syscall_adapter.c b/framework/core/adapter/syscall/src/hdf_syscall_adapter.c
index acc5c7ee9c51e4929a955f292f91bc1234dfee26..9e0bde6614b8e5a827ac5ce2163cc627afa7c1ad 100644
--- a/framework/core/adapter/syscall/src/hdf_syscall_adapter.c
+++ b/framework/core/adapter/syscall/src/hdf_syscall_adapter.c
@@ -21,7 +21,7 @@
 
 #include "hdf_base.h"
 #include "hdf_io_service.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_sbuf.h"
 #include "osal_mem.h"
 #include "osal_thread.h"
diff --git a/framework/core/adapter/vnode/src/hdf_vnode_adapter.c b/framework/core/adapter/vnode/src/hdf_vnode_adapter.c
index b4de17d5549f6667416e18794a852ee26af37dde..4b6420da881b87cfa64b3e29b37dd97b13394fb5 100644
--- a/framework/core/adapter/vnode/src/hdf_vnode_adapter.c
+++ b/framework/core/adapter/vnode/src/hdf_vnode_adapter.c
@@ -14,7 +14,7 @@
 #include <securec.h>
 #include "devsvc_manager_clnt.h"
 #include "hdf_device_node_ext.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_sbuf.h"
 
 #define HDF_LOG_TAG          hdf_vnode
diff --git a/framework/core/common/src/devmgr_service_start.c b/framework/core/common/src/devmgr_service_start.c
index ad0c8d2582a559e57debc261c3fd939c1478d1fa..94a0991ad896485ea4672f545afb80adf7a92117 100644
--- a/framework/core/common/src/devmgr_service_start.c
+++ b/framework/core/common/src/devmgr_service_start.c
@@ -14,7 +14,7 @@
 #include "hdf_base.h"
 #include "hdf_device_node.h"
 #include "hdf_io_service.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_power_manager.h"
 #include "hdf_sbuf.h"
 
diff --git a/framework/core/common/src/hdf_attribute.c b/framework/core/common/src/hdf_attribute.c
index 2337c49ddb25c083cb26cc9d59964c84e3cf5405..d43dd9cccddac9a31201bd73a975759d0ac354c5 100644
--- a/framework/core/common/src/hdf_attribute.c
+++ b/framework/core/common/src/hdf_attribute.c
@@ -11,7 +11,7 @@
 #include "hdf_attribute_manager.h"
 #include "hdf_device_desc.h"
 #include "hdf_host_info.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #ifdef LOSCFG_DRIVERS_HDF_USB_PNP_NOTIFY
 #include "usb_pnp_manager.h"
 #endif
diff --git a/framework/core/common/src/hdf_attribute_macro.c b/framework/core/common/src/hdf_attribute_macro.c
index 7fc3de1c8077b1cc9f2340d7c71a39fd18689a77..b9cfd18a0cec70d2b0bb5dbfe6d1968177dec204 100644
--- a/framework/core/common/src/hdf_attribute_macro.c
+++ b/framework/core/common/src/hdf_attribute_macro.c
@@ -13,7 +13,7 @@
 #include "hdf_config_macro.h"
 #include "hdf_device_desc.h"
 #include "hdf_host_info.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 
 #define HDF_LOG_TAG hdf_attr_macro
diff --git a/framework/core/common/src/hdf_device_node_ext.c b/framework/core/common/src/hdf_device_node_ext.c
index 7231c24321c002a521c9f9b3ac19a531f35d477f..4a9c15c6dd4135c80b4d51bc8ee60b8ed2fd22e3 100644
--- a/framework/core/common/src/hdf_device_node_ext.c
+++ b/framework/core/common/src/hdf_device_node_ext.c
@@ -11,7 +11,7 @@
 #include "hdf_base.h"
 #include "hdf_device_desc.h"
 #include "hdf_io_service.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_sbuf.h"
 #include "osal_mem.h"
 
diff --git a/framework/core/host/src/devhost_service.c b/framework/core/host/src/devhost_service.c
index 166dc7d4a2cf4fb1edab794f7d1c6faf6ce781e7..543835580652c407d1c85214be6cffba0429e972 100644
--- a/framework/core/host/src/devhost_service.c
+++ b/framework/core/host/src/devhost_service.c
@@ -11,7 +11,7 @@
 #include "hdf_base.h"
 #include "hdf_driver.h"
 #include "hdf_driver_loader.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_object_manager.h"
 #include "osal_mem.h"
 #include "power_state_token.h"
diff --git a/framework/core/host/src/devmgr_service_clnt.c b/framework/core/host/src/devmgr_service_clnt.c
index 9434a61819180be8ad2d3efb99546bc8cbf2997b..a8482e07a1a3e633c5a5e04fcda92fcfc9c206dd 100644
--- a/framework/core/host/src/devmgr_service_clnt.c
+++ b/framework/core/host/src/devmgr_service_clnt.c
@@ -9,7 +9,7 @@
 #include "devmgr_service_clnt.h"
 #include "hdf_base.h"
 #include "hdf_device.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_object_manager.h"
 
 #define HDF_LOG_TAG devmgr_service_clnt
diff --git a/framework/core/host/src/devsvc_manager_clnt.c b/framework/core/host/src/devsvc_manager_clnt.c
index 590823b07e2ecda3c0407bc09b7d7d76c512bb23..863cb890d6c7d9ad1745e0a2e42b8706d1978485 100644
--- a/framework/core/host/src/devsvc_manager_clnt.c
+++ b/framework/core/host/src/devsvc_manager_clnt.c
@@ -7,7 +7,7 @@
  */
 
 #include "devsvc_manager_clnt.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_object_manager.h"
 
 #define HDF_LOG_TAG devsvc_manager_clnt
diff --git a/framework/core/host/src/hdf_device.c b/framework/core/host/src/hdf_device.c
index 04e899ff610bf780b2973be2b21bac4ec854c06d..daa968217c9ad2f179fa5acb027c505aa3124ad0 100644
--- a/framework/core/host/src/hdf_device.c
+++ b/framework/core/host/src/hdf_device.c
@@ -10,7 +10,7 @@
 #include "hdf_base.h"
 #include "hdf_device_node.h"
 #include "hdf_device_token.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_object_manager.h"
 #include "osal_mem.h"
 
diff --git a/framework/core/host/src/hdf_device_node.c b/framework/core/host/src/hdf_device_node.c
index 6475b09911548adada22a00f0b9fc05fa599d9b5..00f1f950df766cb57cd6af0b61434df1d7dc28a7 100644
--- a/framework/core/host/src/hdf_device_node.c
+++ b/framework/core/host/src/hdf_device_node.c
@@ -17,7 +17,7 @@
 #include "hdf_device_object.h"
 #include "hdf_device_token.h"
 #include "hdf_driver_loader.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_object_manager.h"
 #include "osal_mem.h"
 #include "power_state_token.h"
diff --git a/framework/core/host/src/hdf_device_object.c b/framework/core/host/src/hdf_device_object.c
index fed79048e1939dbf24ebb5e2fd9ea6b9e6403a29..3254b9e25a14df2388b8bdf7ef2ac049609070a3 100644
--- a/framework/core/host/src/hdf_device_object.c
+++ b/framework/core/host/src/hdf_device_object.c
@@ -13,7 +13,7 @@
 #include "hdf_cstring.h"
 #include "hdf_device_node.h"
 #include "hdf_driver_loader.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_object_manager.h"
 #include "hdf_power_manager.h"
 #include "hdf_service_observer.h"
diff --git a/framework/core/host/src/hdf_driver_loader.c b/framework/core/host/src/hdf_driver_loader.c
index abcbdce8dbdfebf238e3122a3eb6a338acd14acc..e8c55456914147b80a09e5ecb418f22d89acae9c 100644
--- a/framework/core/host/src/hdf_driver_loader.c
+++ b/framework/core/host/src/hdf_driver_loader.c
@@ -8,7 +8,7 @@
 
 #include "hdf_driver_loader.h"
 #include "hdf_driver.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_object_manager.h"
 
 #define HDF_LOG_TAG driver_loader
diff --git a/framework/core/host/src/hdf_load_vdi.c b/framework/core/host/src/hdf_load_vdi.c
index b5c9c79c02beb706a96566530e32d2c29e1ad7cc..7b7068100e123108e20497528abdd53e81989d23 100644
--- a/framework/core/host/src/hdf_load_vdi.c
+++ b/framework/core/host/src/hdf_load_vdi.c
@@ -8,7 +8,7 @@
 
 #include <dlfcn.h>
 #include <unistd.h>
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "securec.h"
 #include "hdf_load_vdi.h"
diff --git a/framework/core/host/src/hdf_observer_record.c b/framework/core/host/src/hdf_observer_record.c
index ba60bcc7a400eecd46be12f4ee221250dd1ac93b..576bd5da728c0110eb2688572c35edb506d66e76 100644
--- a/framework/core/host/src/hdf_observer_record.c
+++ b/framework/core/host/src/hdf_observer_record.c
@@ -7,7 +7,7 @@
  */
 
 #include "hdf_observer_record.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_service_subscriber.h"
 #include "osal_mem.h"
 
diff --git a/framework/core/host/src/hdf_power_manager.c b/framework/core/host/src/hdf_power_manager.c
index 24894c0d36ef6e81cf79fa90214acd6420cd86b7..70abf7934c2b55b6e4e73c90f5e0a3b8f60e7324 100644
--- a/framework/core/host/src/hdf_power_manager.c
+++ b/framework/core/host/src/hdf_power_manager.c
@@ -7,7 +7,7 @@
  */
 
 #include "hdf_power_manager.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_pm_reg.h"
 #include "osal_mem.h"
 #include "power_state_token.h"
diff --git a/framework/core/host/src/hdf_service_observer.c b/framework/core/host/src/hdf_service_observer.c
index e81bb4c2661289e2db73feb4459f221c21e27903..a767a1304245f79dfbf7725b7d13d4919d85b84b 100644
--- a/framework/core/host/src/hdf_service_observer.c
+++ b/framework/core/host/src/hdf_service_observer.c
@@ -9,7 +9,7 @@
 #include "hdf_service_observer.h"
 #include "hdf_base.h"
 #include "hdf_cstring.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_observer_record.h"
 #include "hdf_service_subscriber.h"
 
diff --git a/framework/core/host/test/sample/vdi_sample1_driver.c b/framework/core/host/test/sample/vdi_sample1_driver.c
index b2b805c2f92b9b0f99d4fd94a29205d62f7753c7..08934d2bc8de6315758847f7b5f70e92b8babe1d 100644
--- a/framework/core/host/test/sample/vdi_sample1_driver.c
+++ b/framework/core/host/test/sample/vdi_sample1_driver.c
@@ -8,7 +8,7 @@
 
 #include "hdf_base.h"
 #include "hdf_load_vdi.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "vdi_sample1_driver.h"
 
 #define HDF_LOG_TAG vdi_sample1
diff --git a/framework/core/host/test/sample/vdi_sample1_symbol.c b/framework/core/host/test/sample/vdi_sample1_symbol.c
index ceab385bb7aaba724281c31a43f5d39af33acef4..bfbb6f1877333f53d618f27b0281b2c806549e87 100644
--- a/framework/core/host/test/sample/vdi_sample1_symbol.c
+++ b/framework/core/host/test/sample/vdi_sample1_symbol.c
@@ -8,7 +8,7 @@
 
 #include "hdf_base.h"
 #include "hdf_load_vdi.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #include "vdi_sample1_symbol.h"
 
diff --git a/framework/core/host/test/sample/vdi_sample2_driver.cpp b/framework/core/host/test/sample/vdi_sample2_driver.cpp
index a214ded9c61d35e76d6b84370f154c412a91d1df..44ce0a187844e4f05157c4440a3051ffb70b8bde 100644
--- a/framework/core/host/test/sample/vdi_sample2_driver.cpp
+++ b/framework/core/host/test/sample/vdi_sample2_driver.cpp
@@ -8,7 +8,7 @@
 
 #include "hdf_base.h"
 #include "hdf_load_vdi.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "vdi_sample2_driver.h"
 
 #define HDF_LOG_TAG vdi_sample2
diff --git a/framework/core/manager/src/devhost_service_clnt.c b/framework/core/manager/src/devhost_service_clnt.c
index 354b4e0469e2bb38ca718ba8433f1aa8ded2ee5d..421cbbd389d7699ad6558cb6a9d2f285d08cded0 100644
--- a/framework/core/manager/src/devhost_service_clnt.c
+++ b/framework/core/manager/src/devhost_service_clnt.c
@@ -11,7 +11,7 @@
 #include "devmgr_service_start.h"
 #include "hdf_base.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 
 #define HDF_LOG_TAG devhost_service_clnt
diff --git a/framework/core/manager/src/device_token_clnt.c b/framework/core/manager/src/device_token_clnt.c
index 6d50b1b2d449a2adc0fbe4f0a641169e51d8980f..86cb20bf0ecc889f0da4c76c04f9f295c073524c 100644
--- a/framework/core/manager/src/device_token_clnt.c
+++ b/framework/core/manager/src/device_token_clnt.c
@@ -8,7 +8,7 @@
 
 #include "device_token_clnt.h"
 #include "hdf_device_token.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 
 #define HDF_LOG_TAG device_token_clnt
diff --git a/framework/core/manager/src/devmgr_service.c b/framework/core/manager/src/devmgr_service.c
index ad72ae34e1bc9c84321290d983aeaa051fc9e926..432bb052a7b102d2cf4d881d75718e7b3a9d3d62 100644
--- a/framework/core/manager/src/devmgr_service.c
+++ b/framework/core/manager/src/devmgr_service.c
@@ -14,7 +14,7 @@
 #include "hdf_base.h"
 #include "hdf_driver_installer.h"
 #include "hdf_host_info.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_object_manager.h"
 #include "osal_time.h"
 
diff --git a/framework/core/manager/src/devsvc_manager.c b/framework/core/manager/src/devsvc_manager.c
index eee7cfd2f8864f8a390fb8911a9ce77e7330ba2a..911beab55fd7b97f8d108a5fd905a44897bd0717 100644
--- a/framework/core/manager/src/devsvc_manager.c
+++ b/framework/core/manager/src/devsvc_manager.c
@@ -11,7 +11,7 @@
 #include "hdf_base.h"
 #include "hdf_cstring.h"
 #include "hdf_device_node.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_object_manager.h"
 #include "hdf_service_record.h"
 #include "osal_mem.h"
diff --git a/framework/core/manager/src/devsvc_manager_ext.c b/framework/core/manager/src/devsvc_manager_ext.c
index aea085026dc7519e9956efb1e1f80241eb471e27..693202335679cb1659aafd3065e032dc4c1fab5c 100644
--- a/framework/core/manager/src/devsvc_manager_ext.c
+++ b/framework/core/manager/src/devsvc_manager_ext.c
@@ -11,7 +11,7 @@
 #include "hdf_base.h"
 #include "hdf_device_node.h"
 #include "hdf_io_service.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_object_manager.h"
 #include "osal_mem.h"
 #include "svcmgr_ioservice.h"
diff --git a/framework/core/manager/src/driver_manager.c b/framework/core/manager/src/driver_manager.c
index 23193e81490cf2755af93becdc48a7d7e6972bab..bb6835586b00728c58321a6ad833cc368ac87cb0 100644
--- a/framework/core/manager/src/driver_manager.c
+++ b/framework/core/manager/src/driver_manager.c
@@ -8,7 +8,7 @@
 
 #include "hdf_dlist.h"
 #include "hdf_driver.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "osal_sysevent.h"
 
diff --git a/framework/core/manager/src/hdf_driver_installer.c b/framework/core/manager/src/hdf_driver_installer.c
index 730bc92c2dd4f0aecfc3fa2431b447414fbd833e..f03fb05c310828826ea63ddcfc6326dd249f8573 100644
--- a/framework/core/manager/src/hdf_driver_installer.c
+++ b/framework/core/manager/src/hdf_driver_installer.c
@@ -8,7 +8,7 @@
 
 #include "hdf_driver_installer.h"
 #include "devhost_service.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_object_manager.h"
 
 #define HDF_LOG_TAG driver_installer
diff --git a/framework/core/manager/src/servstat_listener_holder.c b/framework/core/manager/src/servstat_listener_holder.c
index b73ebbff5613d586d45356ac6c262ec5072f2c1f..d7df5bee876e6d07b9c0d11719d7e3075423600c 100644
--- a/framework/core/manager/src/servstat_listener_holder.c
+++ b/framework/core/manager/src/servstat_listener_holder.c
@@ -8,7 +8,7 @@
 #include "devsvc_listener_holder.h"
 #include "hdf_base.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mutex.h"
 #include "osal_mem.h"
 
diff --git a/framework/core/manager/test/unittest/common/hdf_ioservice_test.cpp b/framework/core/manager/test/unittest/common/hdf_ioservice_test.cpp
index b05545ff1a861f827efc6375caaedfaa6bae97f2..37b2bb09399c1a1be9d3e6edfdbebd9ab06a7e09 100644
--- a/framework/core/manager/test/unittest/common/hdf_ioservice_test.cpp
+++ b/framework/core/manager/test/unittest/common/hdf_ioservice_test.cpp
@@ -17,7 +17,7 @@
 #include <unistd.h>
 
 #include "hdf_io_service.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_power_state.h"
 #include "hdf_sbuf.h"
 #include "hdf_uhdf_test.h"
diff --git a/framework/core/shared/include/hdf_attribute_macro.h b/framework/core/shared/include/hdf_attribute_macro.h
index 58330efb324adc44346685e5f5cf03efe7ac3cf1..e0d982e577fe25f02c451772255031c38477387c 100644
--- a/framework/core/shared/include/hdf_attribute_macro.h
+++ b/framework/core/shared/include/hdf_attribute_macro.h
@@ -9,7 +9,7 @@
 #ifndef HDF_ATTRIBUTE_MACRO_H
 #define HDF_ATTRIBUTE_MACRO_H
 
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_dlist.h"
 
 struct HdfDevHostMgr {
diff --git a/framework/core/shared/src/hdf_device_info.c b/framework/core/shared/src/hdf_device_info.c
index 7651ef79f14b5508b9b009dcb08415986353ad55..ceb942058e1e116609128ec9a1343be54c34fe74 100644
--- a/framework/core/shared/src/hdf_device_info.c
+++ b/framework/core/shared/src/hdf_device_info.c
@@ -8,7 +8,7 @@
 
 #include "hdf_device_info.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 
 #define HDF_LOG_TAG device_info
diff --git a/framework/core/shared/src/service_status.c b/framework/core/shared/src/service_status.c
index 2e2a73fa887606746873369a5d1fcf8fa221c98d..801b9e29bb69f731c587f28303cff71a864943fe 100644
--- a/framework/core/shared/src/service_status.c
+++ b/framework/core/shared/src/service_status.c
@@ -6,7 +6,7 @@
  * See the LICENSE file in the root of this repository for complete details.
  */
 
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_sbuf.h"
 #include "hdf_service_status.h"
 
diff --git a/framework/core/shared/src/svcmgr_ioservice.c b/framework/core/shared/src/svcmgr_ioservice.c
index f9061014bb5d8b9cf2f4bd66f966e8d5482ac8e0..7018645420f51bc1e605d8997d40bdd09866be2e 100644
--- a/framework/core/shared/src/svcmgr_ioservice.c
+++ b/framework/core/shared/src/svcmgr_ioservice.c
@@ -10,7 +10,7 @@
 #include "hdf_base.h"
 #include "hdf_dlist.h"
 #include "hdf_io_service_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_sbuf.h"
 #include "ioservstat_listener.h"
 #include "osal_mem.h"
diff --git a/framework/include/bluetooth/hdf_chip_config.h b/framework/include/bluetooth/hdf_chip_config.h
index 17f0ad595a0ad08ac3faa417969f80ccafa23375..905bf2c24681567935890682127d5919fb2a68b8 100644
--- a/framework/include/bluetooth/hdf_chip_config.h
+++ b/framework/include/bluetooth/hdf_chip_config.h
@@ -11,7 +11,7 @@
 
 #include "device_resource_if.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "securec.h"
 
diff --git a/framework/include/net/net_device.h b/framework/include/net/net_device.h
index 25f3dfebb02574fcb09f660bec64c731e32bb34a..1da459ab092cbdd86f00d9368cffc80228f9c06d 100644
--- a/framework/include/net/net_device.h
+++ b/framework/include/net/net_device.h
@@ -42,7 +42,7 @@
 #endif
 #include "hdf_base.h"
 #include "hdf_netbuf.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "net_device_types_adapter.h"
 
 #ifdef __cplusplus
diff --git a/framework/include/osal.h b/framework/include/osal.h
index e3aeff29f489998cd45a984cc188fa4d4afbde25..546d3e34ff11c6ac8257bf136d3d7b95f9d9bf49 100644
--- a/framework/include/osal.h
+++ b/framework/include/osal.h
@@ -11,7 +11,7 @@
 
 #include "hdf_base.h"
 #include "hdf_dlist.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_firmware.h"
 #include "osal_irq.h"
 #include "osal_mem.h"
diff --git a/framework/model/audio/common/include/audio_driver_log.h b/framework/model/audio/common/include/audio_driver_log.h
index 73ccacc24d6df9ef358c0f3082c239d311a82c08..6e3c4db2f50c272ff678f7ef7218fb1017bbce41 100644
--- a/framework/model/audio/common/include/audio_driver_log.h
+++ b/framework/model/audio/common/include/audio_driver_log.h
@@ -8,7 +8,7 @@
 
 #ifndef AUDIO_DRIVER_LOG_H
 #define AUDIO_DRIVER_LOG_H
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #ifdef __cplusplus
 #if __cplusplus
diff --git a/framework/model/audio/core/include/audio_host.h b/framework/model/audio/core/include/audio_host.h
index 60e8ec54dd75c7a046f40899e8ff0c31299c7314..9b264edf5b9e26620fab162514bd54d75cde8087 100644
--- a/framework/model/audio/core/include/audio_host.h
+++ b/framework/model/audio/core/include/audio_host.h
@@ -12,7 +12,7 @@
 #include "hdf_base.h"
 #include "hdf_dlist.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "device_resource_if.h"
 #include "osal_mem.h"
 #include "osal_mutex.h"
diff --git a/framework/model/camera/buffer_manager/src/buffer_queue.c b/framework/model/camera/buffer_manager/src/buffer_queue.c
index ce46e900e43fe917a357dd3e336faeec18873227..8cc962050d5149d8ac5cbf7a348588ab79ae1d76 100644
--- a/framework/model/camera/buffer_manager/src/buffer_queue.c
+++ b/framework/model/camera/buffer_manager/src/buffer_queue.c
@@ -7,7 +7,7 @@
  */
 
 #include <securec.h>
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include <osal_mem.h>
 #include "osal_uaccess.h"
 #include "camera_buffer_manager.h"
diff --git a/framework/model/camera/buffer_manager/src/camera_buffer.c b/framework/model/camera/buffer_manager/src/camera_buffer.c
index 92bd4975b20aadc0d0625e3a20f59424573050a6..d4821bdbcbe56e0719914ad09b1f41c7bb67a932 100644
--- a/framework/model/camera/buffer_manager/src/camera_buffer.c
+++ b/framework/model/camera/buffer_manager/src/camera_buffer.c
@@ -7,7 +7,7 @@
  */
 
 #include <securec.h>
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include <osal_mem.h>
 #include "osal_uaccess.h"
 #include "buffer_queue.h"
diff --git a/framework/model/camera/buffer_manager/src/camera_buffer_manager.c b/framework/model/camera/buffer_manager/src/camera_buffer_manager.c
index 2e66821980f1c4c990201e1187f8d1610b99fb90..df54b93445423f1674ce974aa1fd6499290f0039 100644
--- a/framework/model/camera/buffer_manager/src/camera_buffer_manager.c
+++ b/framework/model/camera/buffer_manager/src/camera_buffer_manager.c
@@ -7,7 +7,7 @@
  */
 
 #include <securec.h>
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include <osal_mem.h>
 #include "osal_uaccess.h"
 #include "buffer_queue.h"
diff --git a/framework/model/camera/core/src/camera_core.c b/framework/model/camera/core/src/camera_core.c
index bc08e3db0f0c4e77ec94728d393092924cde89cd..c8438f413405eae4b766a543127bd0b6af444808 100644
--- a/framework/model/camera/core/src/camera_core.c
+++ b/framework/model/camera/core/src/camera_core.c
@@ -7,7 +7,7 @@
  */
 
 #include <securec.h>
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include <osal_mem.h>
 #include <core/hdf_device_desc.h>
 #include <camera/camera_product.h>
diff --git a/framework/model/camera/device_impl/src/camera_common_device.c b/framework/model/camera/device_impl/src/camera_common_device.c
index c01627edc60bfa675fcd161f70285e204974bc7b..0e5aa779be8a90dd84bca996c6143634a786c042 100644
--- a/framework/model/camera/device_impl/src/camera_common_device.c
+++ b/framework/model/camera/device_impl/src/camera_common_device.c
@@ -7,7 +7,7 @@
  */
 
 #include <securec.h>
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include "camera_config_parser.h"
 #include "camera_utils.h"
 #include "camera_stream.h"
diff --git a/framework/model/camera/device_impl/src/camera_flash.c b/framework/model/camera/device_impl/src/camera_flash.c
index b5df63aa2374884516e3e1e17ccacd8c32044e07..35076f72bf720d4ddef5ff59272bd4e5692d09c9 100644
--- a/framework/model/camera/device_impl/src/camera_flash.c
+++ b/framework/model/camera/device_impl/src/camera_flash.c
@@ -7,7 +7,7 @@
  */
 
 #include <securec.h>
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include "camera_config_parser.h"
 #include "camera_utils.h"
 #include "camera_flash.h"
diff --git a/framework/model/camera/device_impl/src/camera_isp.c b/framework/model/camera/device_impl/src/camera_isp.c
index 5c0118f3c184252ae276d0ff6aad599e87e90e23..12b0bcd5133b5ffe0b503696eaf28d30a3ecee82 100644
--- a/framework/model/camera/device_impl/src/camera_isp.c
+++ b/framework/model/camera/device_impl/src/camera_isp.c
@@ -7,7 +7,7 @@
  */
 
 #include <securec.h>
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include "camera_config_parser.h"
 #include "camera_utils.h"
 #include "camera_isp.h"
diff --git a/framework/model/camera/device_impl/src/camera_lens.c b/framework/model/camera/device_impl/src/camera_lens.c
index b476b541dde7c9434c6532bc065776d0c3c1f8b2..f4c2c37ea9299befabb7bfc3f9ee7f730b8be1da 100644
--- a/framework/model/camera/device_impl/src/camera_lens.c
+++ b/framework/model/camera/device_impl/src/camera_lens.c
@@ -7,7 +7,7 @@
  */
 
 #include <securec.h>
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include "camera_config_parser.h"
 #include "camera_utils.h"
 #include "camera_lens.h"
diff --git a/framework/model/camera/device_impl/src/camera_sensor.c b/framework/model/camera/device_impl/src/camera_sensor.c
index ebec0fd16739da7828741c47af7d08dcd2b7018c..9bbe76e0afa8df28d876a124f642d0fe160663e9 100644
--- a/framework/model/camera/device_impl/src/camera_sensor.c
+++ b/framework/model/camera/device_impl/src/camera_sensor.c
@@ -7,7 +7,7 @@
  */
 
 #include <securec.h>
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include "camera_config_parser.h"
 #include "camera_utils.h"
 #include "camera_sensor.h"
diff --git a/framework/model/camera/device_impl/src/camera_stream.c b/framework/model/camera/device_impl/src/camera_stream.c
index c76ef3672a55ded4078c2ee8f09adb13881c13f7..4a045385b9f9797cee7c0dab95629ce258f6eee8 100644
--- a/framework/model/camera/device_impl/src/camera_stream.c
+++ b/framework/model/camera/device_impl/src/camera_stream.c
@@ -7,7 +7,7 @@
  */
 
 #include <securec.h>
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include <camera/camera_product.h>
 #include "camera_buffer_manager.h"
 #include "camera_config_parser.h"
diff --git a/framework/model/camera/device_impl/src/camera_uvc.c b/framework/model/camera/device_impl/src/camera_uvc.c
index 4261a97e034d8dd09be08e925af13318f8774277..eaf88b0eeb0c37cebf17efff7f9c641362a1c667 100644
--- a/framework/model/camera/device_impl/src/camera_uvc.c
+++ b/framework/model/camera/device_impl/src/camera_uvc.c
@@ -7,7 +7,7 @@
  */
 
 #include <securec.h>
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include "camera_buffer_manager.h"
 #include "camera_config_parser.h"
 #include "camera_event.h"
diff --git a/framework/model/camera/device_impl/src/camera_vcm.c b/framework/model/camera/device_impl/src/camera_vcm.c
index 66676cfe0604d7feef125b938b79b181738c92e8..4609803187a0a1a6542a28484894f0f09d70f3ff 100644
--- a/framework/model/camera/device_impl/src/camera_vcm.c
+++ b/framework/model/camera/device_impl/src/camera_vcm.c
@@ -7,7 +7,7 @@
  */
 
 #include <securec.h>
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include "camera_config_parser.h"
 #include "camera_utils.h"
 #include "camera_vcm.h"
diff --git a/framework/model/camera/device_manager/src/camera_device_manager.c b/framework/model/camera/device_manager/src/camera_device_manager.c
index 830054d6f3f92d1399d2585c11790baf331581e9..0398cdff14b62c8690cd53acbf59994dadc9754b 100644
--- a/framework/model/camera/device_manager/src/camera_device_manager.c
+++ b/framework/model/camera/device_manager/src/camera_device_manager.c
@@ -7,7 +7,7 @@
  */
 
 #include <securec.h>
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include <osal_mem.h>
 #include "camera_config_parser.h"
 #include "camera_device_manager.h"
diff --git a/framework/model/camera/dispatch/src/camera_dispatch.c b/framework/model/camera/dispatch/src/camera_dispatch.c
index 9a1f8fc07689ef691c76aa163d46d502748cfe88..f8ba47abb960c706ff143d7c4cda4c84455fdccb 100644
--- a/framework/model/camera/dispatch/src/camera_dispatch.c
+++ b/framework/model/camera/dispatch/src/camera_dispatch.c
@@ -7,7 +7,7 @@
  */
 
 #include <securec.h>
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include "camera_common_device.h"
 #include "camera_stream.h"
 #include "camera_sensor.h"
diff --git a/framework/model/camera/event/src/camera_event.c b/framework/model/camera/event/src/camera_event.c
index a15beb603165b5a8ddc051cc33cc9ab2195900f2..b10a045354917e398dc971c6e680ae9a0a507ac7 100644
--- a/framework/model/camera/event/src/camera_event.c
+++ b/framework/model/camera/event/src/camera_event.c
@@ -6,7 +6,7 @@
  * See the LICENSE file in the root of this repository for complete details.
  */
 
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include <osal_mem.h>
 #include "hdf_slist.h"
 #include "camera_device_manager.h"
diff --git a/framework/model/camera/parser/src/camera_config_parser.c b/framework/model/camera/parser/src/camera_config_parser.c
index 12221af94db7c088f98ef2586f655dbb4b2c63e0..8e415be75512bbf174ccae86f1963c0d88713022 100644
--- a/framework/model/camera/parser/src/camera_config_parser.c
+++ b/framework/model/camera/parser/src/camera_config_parser.c
@@ -6,7 +6,7 @@
  * See the LICENSE file in the root of this repository for complete details.
  */
 
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include "camera_config_parser.h"
 
 #define HDF_LOG_TAG HDF_CAMERA_PARSER
diff --git a/framework/model/camera/utils/src/camera_utils.c b/framework/model/camera/utils/src/camera_utils.c
index 018c008c679cae945037197dad207e7dcd84f9a6..65828c97227ae18b992e685403982d04f48967f1 100644
--- a/framework/model/camera/utils/src/camera_utils.c
+++ b/framework/model/camera/utils/src/camera_utils.c
@@ -7,7 +7,7 @@
  */
 
 #include <securec.h>
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include "camera_config_parser.h"
 #include "camera_device_manager.h"
 #include "camera_utils.h"
diff --git a/framework/model/display/driver/adapter_soc/hi35xx_disp.c b/framework/model/display/driver/adapter_soc/hi35xx_disp.c
index bd30312ed63178245c53ba659e1f1d04bb57c7dc..23fe7444fadcb6cca2c9a0d97d1ed22272a96bc2 100644
--- a/framework/model/display/driver/adapter_soc/hi35xx_disp.c
+++ b/framework/model/display/driver/adapter_soc/hi35xx_disp.c
@@ -11,7 +11,7 @@
 #include "hdf_base.h"
 #include "hdf_device_desc.h"
 #include "hdf_disp.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_io.h"
 #include "pwm_if.h"
 
diff --git a/framework/model/display/driver/backlight/hdf_bl.c b/framework/model/display/driver/backlight/hdf_bl.c
index ca889de875ff40e85513fa22550f04e58c959eb4..24edcf4da4d0f834aa7169aa4158311824c537e3 100644
--- a/framework/model/display/driver/backlight/hdf_bl.c
+++ b/framework/model/display/driver/backlight/hdf_bl.c
@@ -9,7 +9,7 @@
 #include "hdf_bl.h"
 #include <securec.h>
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal.h"
 
 #define OFFSET_TWO_BYTE       16
diff --git a/framework/model/display/driver/backlight/pwm_bl.c b/framework/model/display/driver/backlight/pwm_bl.c
index f6566254db4736cf8ef191792a8d0c5089965dae..2a2b72947c6c1d1d476c4aef53ed9af5d2b117a7 100644
--- a/framework/model/display/driver/backlight/pwm_bl.c
+++ b/framework/model/display/driver/backlight/pwm_bl.c
@@ -10,7 +10,7 @@
 #include "hdf_base.h"
 #include "hdf_bl.h"
 #include "hdf_disp.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_types.h"
 #include "osal.h"
 #include "pwm_if.h"
diff --git a/framework/model/display/driver/hdf_disp.c b/framework/model/display/driver/hdf_disp.c
index 37e24692c1918f39c1dbfe5d2e2fe49b56aa1a17..17247266cfb9d570595be99e71efd8673849d97b 100644
--- a/framework/model/display/driver/hdf_disp.c
+++ b/framework/model/display/driver/hdf_disp.c
@@ -10,7 +10,7 @@
 #include <securec.h>
 #include "hdf_base.h"
 #include "hdf_bl.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal.h"
 
 #define OFFSET_TWO_BYTE    16
diff --git a/framework/model/display/driver/hdf_disp.h b/framework/model/display/driver/hdf_disp.h
index 53fd8bc2ac36f982a3775d44104c0dca79f252c8..36180facf89aaa07d59893887232d278f0d9b795 100644
--- a/framework/model/display/driver/hdf_disp.h
+++ b/framework/model/display/driver/hdf_disp.h
@@ -11,7 +11,7 @@
 
 #include "hdf_base.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_sbuf.h"
 #include "hdf_workqueue.h"
 #include "mipi_dsi_if.h"
diff --git a/framework/model/display/driver/lcdkit/lcdkit_parse_config.c b/framework/model/display/driver/lcdkit/lcdkit_parse_config.c
index 88a0522e1df4872b8082718447a62b6374494b0d..30241367e67822a951c6e845ec14c6013fee7110 100644
--- a/framework/model/display/driver/lcdkit/lcdkit_parse_config.c
+++ b/framework/model/display/driver/lcdkit/lcdkit_parse_config.c
@@ -8,7 +8,7 @@
 
 #include <securec.h>
 #include "lite_lcdkit.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define PARSE_PANEL_SYMBOL(node, ops, symbol, out) do { \
     if ((ops)->GetUint32((node), (symbol), (out), 0)) { \
diff --git a/framework/model/display/driver/lcdkit/lite_lcdkit.c b/framework/model/display/driver/lcdkit/lite_lcdkit.c
index b7b3cd4bca4b2f4b305b69b71b1f678f3df219c5..d60bb3512b8173c332bc4191115205b98845b3ce 100644
--- a/framework/model/display/driver/lcdkit/lite_lcdkit.c
+++ b/framework/model/display/driver/lcdkit/lite_lcdkit.c
@@ -9,7 +9,7 @@
 #include <securec.h>
 #include "gpio_if.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "mipi_dsi_if.h"
 #include "osal.h"
 #include "pwm_if.h"
diff --git a/framework/model/display/driver/panel/mipi_icn9700.c b/framework/model/display/driver/panel/mipi_icn9700.c
index 279ed825eb9368ed758a9e65aaa93a692bfca386..a49a8884bb4a50d685a1a3efed7834eb4bd0d7db 100644
--- a/framework/model/display/driver/panel/mipi_icn9700.c
+++ b/framework/model/display/driver/panel/mipi_icn9700.c
@@ -9,7 +9,7 @@
 #include "gpio_if.h"
 #include "hdf_bl.h"
 #include "hdf_disp.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "mipi_dsi_if.h"
 #include "osal.h"
 #include "pwm_if.h"
diff --git a/framework/model/display/driver/panel/ssp_st7789.c b/framework/model/display/driver/panel/ssp_st7789.c
index 67063c8d01d1ea8eabc7bd03636175b41494eef8..56d7a9c9d3b1ae98465561bf8c25d74f5ee5463f 100644
--- a/framework/model/display/driver/panel/ssp_st7789.c
+++ b/framework/model/display/driver/panel/ssp_st7789.c
@@ -8,7 +8,7 @@
 
 #include "gpio_if.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "osal_time.h"
 #include "spi_if.h"
diff --git a/framework/model/input/driver/event_hub.c b/framework/model/input/driver/event_hub.c
index ec5dc22957986c39f0a3d034ecd28fbb4007d07c..f293941070805c2a6fa0ced2adbb1cb5975e4ede 100644
--- a/framework/model/input/driver/event_hub.c
+++ b/framework/model/input/driver/event_hub.c
@@ -7,7 +7,7 @@
  */
 
 #include "osal_time.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "event_hub.h"
 
 #define SEC_TO_USEC    1000000
diff --git a/framework/model/input/driver/hdf_encoder.c b/framework/model/input/driver/hdf_encoder.c
index 2185d5c1dff3555553bb08a28d5e5a5a5e52c189..fc3677478513e20e36f908aeab75fabc2ef9800a 100644
--- a/framework/model/input/driver/hdf_encoder.c
+++ b/framework/model/input/driver/hdf_encoder.c
@@ -10,7 +10,7 @@
 #include "event_hub.h"
 #include "gpio_if.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "osal_timer.h"
 
diff --git a/framework/model/input/driver/hdf_hid_adapter.c b/framework/model/input/driver/hdf_hid_adapter.c
index cd96df37bb9ce628a7c2762b39e7e043155bdb37..c6d0016b9978a8c9198b1a8c554272fa9e5618fb 100644
--- a/framework/model/input/driver/hdf_hid_adapter.c
+++ b/framework/model/input/driver/hdf_hid_adapter.c
@@ -10,7 +10,7 @@
 #include <securec.h>
 #include "event_hub.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "osal_timer.h"
 
diff --git a/framework/model/input/driver/hdf_infrared.c b/framework/model/input/driver/hdf_infrared.c
index f9d52abb0c85f42c7752ae17b7003b9f2698e90c..801c86a586934d52901329942a63b4bb24dc01fe 100644
--- a/framework/model/input/driver/hdf_infrared.c
+++ b/framework/model/input/driver/hdf_infrared.c
@@ -11,7 +11,7 @@
 #include "input-event-codes.h"
 #include "osal_mem.h"
 #include "gpio_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_input_device_manager.h"
 #include "event_hub.h"
 
diff --git a/framework/model/input/driver/hdf_input_device_manager.c b/framework/model/input/driver/hdf_input_device_manager.c
index 078b41b1a52c3feb847c36416d6a6b725baff518..e2c08a3414afd9bb8a96d93f8c539919c2213e73 100644
--- a/framework/model/input/driver/hdf_input_device_manager.c
+++ b/framework/model/input/driver/hdf_input_device_manager.c
@@ -11,7 +11,7 @@
 #include "event_hub.h"
 #include "hdf_base.h"
 #include "hdf_device_object.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 
 #define NODE_MODE            0660
diff --git a/framework/model/input/driver/hdf_key.c b/framework/model/input/driver/hdf_key.c
index 6b1de392b38deb73b4cfc245ab858caeffabd4cb..c0238207c4e656689ffd7118c32b37719ab7ec07 100644
--- a/framework/model/input/driver/hdf_key.c
+++ b/framework/model/input/driver/hdf_key.c
@@ -9,7 +9,7 @@
 #include "hdf_device_desc.h"
 #include "osal_mem.h"
 #include "gpio_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_input_device_manager.h"
 #include "event_hub.h"
 #include "hdf_key.h"
diff --git a/framework/model/input/driver/hdf_touch.c b/framework/model/input/driver/hdf_touch.c
index 067e929d6809d41d4a415fa4138c416252429ef2..dedb726dc027a9ff8980849f640367bf170b02a4 100644
--- a/framework/model/input/driver/hdf_touch.c
+++ b/framework/model/input/driver/hdf_touch.c
@@ -9,7 +9,7 @@
 #include "hdf_touch.h"
 #include "gpio_if.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_pm.h"
 #include "osal_mem.h"
 #include "osal_io.h"
diff --git a/framework/model/input/driver/input_bus_ops/input_i2c_ops.c b/framework/model/input/driver/input_bus_ops/input_i2c_ops.c
index 3fb6640d2936d6f3253b3feaa5b9a0bd2b33dfc1..79e925834ee8de328263f9f8c73744403da5a344 100644
--- a/framework/model/input/driver/input_bus_ops/input_i2c_ops.c
+++ b/framework/model/input/driver/input_bus_ops/input_i2c_ops.c
@@ -7,7 +7,7 @@
  */
 
 #include <securec.h>
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "input_i2c_ops.h"
 
 #define I2C_READ_MSG_NUM   2
diff --git a/framework/model/input/driver/input_config_parser.c b/framework/model/input/driver/input_config_parser.c
index d60edc4fbb806a92908f35e79594ebdd3845d746..e785629070c23da550dbab9c70697d685fd01bc6 100644
--- a/framework/model/input/driver/input_config_parser.c
+++ b/framework/model/input/driver/input_config_parser.c
@@ -8,7 +8,7 @@
 
 #include <securec.h>
 #include "osal_mem.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "input_config.h"
 
 #define CHECK_PARSER_RET(ret,  str) do { \
diff --git a/framework/model/input/driver/touchscreen/touch_ft5406.c b/framework/model/input/driver/touchscreen/touch_ft5406.c
index 92aba297e8b45c5007e26d0a13d61a8356df3597..070483e417035d27acfd96d3fda82ef91a6ae55d 100755
--- a/framework/model/input/driver/touchscreen/touch_ft5406.c
+++ b/framework/model/input/driver/touchscreen/touch_ft5406.c
@@ -10,7 +10,7 @@
 #include "osal_mem.h"
 #include "osal_io.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_touch.h"
 #include "event_hub.h"
 #include "input_i2c_ops.h"
diff --git a/framework/model/input/driver/touchscreen/touch_ft5x06.c b/framework/model/input/driver/touchscreen/touch_ft5x06.c
index 0db90576efefa3a7dcdcda2b29167604c8699e1b..91738972b589c1720197f8dd41ad79d6a9b73bc4 100644
--- a/framework/model/input/driver/touchscreen/touch_ft5x06.c
+++ b/framework/model/input/driver/touchscreen/touch_ft5x06.c
@@ -12,7 +12,7 @@
 #include "hdf_device_desc.h"
 #include "hdf_touch.h"
 #include "input_i2c_ops.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "input_config.h"
 #include "hdf_input_device_manager.h"
 #include "hdf_types.h"
diff --git a/framework/model/input/driver/touchscreen/touch_ft6336.c b/framework/model/input/driver/touchscreen/touch_ft6336.c
index 422439d2aabf441a9433f46c5c9b5570c0e38d9a..bfe8b6a1c648d3ea73db2303e4cf710823206b46 100644
--- a/framework/model/input/driver/touchscreen/touch_ft6336.c
+++ b/framework/model/input/driver/touchscreen/touch_ft6336.c
@@ -9,7 +9,7 @@
 #include <securec.h>
 #include "osal_mem.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_touch.h"
 #include "input_i2c_ops.h"
 #include "touch_ft6336.h"
diff --git a/framework/model/input/driver/touchscreen/touch_gt911.c b/framework/model/input/driver/touchscreen/touch_gt911.c
index 074c40d9839751889c9c97493258e4e626f6a7ec..e018f3b801b132544b9420ea2039e1c8499b43e1 100644
--- a/framework/model/input/driver/touchscreen/touch_gt911.c
+++ b/framework/model/input/driver/touchscreen/touch_gt911.c
@@ -9,7 +9,7 @@
 #include <securec.h>
 #include "osal_mem.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_touch.h"
 #include "input_i2c_ops.h"
 #include "touch_gt911.h"
diff --git a/framework/model/misc/dsoftbus/src/hdf_dsoftbus_driver.c b/framework/model/misc/dsoftbus/src/hdf_dsoftbus_driver.c
index c837ced89514b313ea21d1744491ea4daf108277..2e2db0a74eeee85a09bb6a0340313d4bd289ea83 100644
--- a/framework/model/misc/dsoftbus/src/hdf_dsoftbus_driver.c
+++ b/framework/model/misc/dsoftbus/src/hdf_dsoftbus_driver.c
@@ -8,7 +8,7 @@
 
 #include "hdf_base.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "module_manager.h"
 
 #define HDF_LOG_TAG "hdf_dsoftbus"
diff --git a/framework/model/misc/dsoftbus/src/module_manager.c b/framework/model/misc/dsoftbus/src/module_manager.c
index 6dc8b25e1267a827de6dd5e72f14f6d9d50ff750..f0539907b5b15ead83510ed304e99fd9ac0bc2c1 100644
--- a/framework/model/misc/dsoftbus/src/module_manager.c
+++ b/framework/model/misc/dsoftbus/src/module_manager.c
@@ -8,7 +8,7 @@
 
 #include "module_manager.h"
 
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #ifdef ENABLE_LWIP_MONITOR
 #include "softbus_lwip_monitor.h"
 #endif
diff --git a/framework/model/misc/dsoftbus/src/wlan_param_monitor.c b/framework/model/misc/dsoftbus/src/wlan_param_monitor.c
index 5851e91273bcfb7b5802323f90e278456f95ec1f..a50ef226e9eea72dfefa0ea3763de32dec39f19f 100644
--- a/framework/model/misc/dsoftbus/src/wlan_param_monitor.c
+++ b/framework/model/misc/dsoftbus/src/wlan_param_monitor.c
@@ -9,7 +9,7 @@
 #include "wlan_param_monitor.h"
 
 #include "hdf_dsoftbus_driver.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "module_manager.h"
 #include "osal_time.h"
 
diff --git a/framework/model/misc/light/driver/include/light_driver.h b/framework/model/misc/light/driver/include/light_driver.h
index 77d1a5ed8b38344caa70e351eb3c12e8d5a52b33..a2caf698422a50a7259ae724c1310bff09dd031c 100644
--- a/framework/model/misc/light/driver/include/light_driver.h
+++ b/framework/model/misc/light/driver/include/light_driver.h
@@ -13,7 +13,7 @@
 #include "gpio_if.h"
 #include "hdf_base.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_workqueue.h"
 #include "osal_mutex.h"
 #include "osal_timer.h"
diff --git a/framework/model/misc/vibrator/driver/include/vibrator_driver_type.h b/framework/model/misc/vibrator/driver/include/vibrator_driver_type.h
index da6ac7c5b8e9207fcb19b1b485ac746abb39e654..039b510e4aa89c1139d573d90021498857cff859 100644
--- a/framework/model/misc/vibrator/driver/include/vibrator_driver_type.h
+++ b/framework/model/misc/vibrator/driver/include/vibrator_driver_type.h
@@ -9,7 +9,7 @@
 #ifndef VIBRATOR_DRIVER_TYPE_H
 #define VIBRATOR_DRIVER_TYPE_H
 
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "i2c_if.h"
 
 #define CHECK_VIBRATOR_NULL_PTR_RETURN_VALUE(ptr, ret) do { \
diff --git a/framework/model/network/ethernet/src/eth_chip_driver.c b/framework/model/network/ethernet/src/eth_chip_driver.c
index b91c0a21a3eeb4b898946fe024e0b6d08a8e8550..d3e6fa194630feb8748ab437a49e2830f0420e3d 100644
--- a/framework/model/network/ethernet/src/eth_chip_driver.c
+++ b/framework/model/network/ethernet/src/eth_chip_driver.c
@@ -7,7 +7,7 @@
  */
 
 #include "eth_chip_driver.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG HDF_ETH_CORE
 
diff --git a/framework/model/network/ethernet/src/eth_device.c b/framework/model/network/ethernet/src/eth_device.c
index 80783088f4fb61421643b4a1adc9b8bf996c0d1b..71090b3dea69503d944c0aa9e831b8f9b26f8e75 100644
--- a/framework/model/network/ethernet/src/eth_device.c
+++ b/framework/model/network/ethernet/src/eth_device.c
@@ -12,7 +12,7 @@
 #include <string.h>
 #endif
 #include "device_resource_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #ifdef __LITEOS__
 #include "los_vm_zone.h"
 #endif
diff --git a/framework/model/network/wifi/bus/hdf_ibus_intf.c b/framework/model/network/wifi/bus/hdf_ibus_intf.c
index 465016e2badca04b785ba89cbbde5d01597f9e4a..007112d7bed1d247b0b3a895d335c034fd1b7a96 100644
--- a/framework/model/network/wifi/bus/hdf_ibus_intf.c
+++ b/framework/model/network/wifi/bus/hdf_ibus_intf.c
@@ -9,7 +9,7 @@
 #include "osal_mem.h"
 #include "securec.h"
 #include "wifi_inc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_wlan_config.h"
 #include "hdf_base.h"
 #include "hdf_ibus_intf.h"
diff --git a/framework/model/network/wifi/bus/hdf_pcie_intf.c b/framework/model/network/wifi/bus/hdf_pcie_intf.c
index 91131ff5c35edcbc7ace0cea846025e5a464a338..fa2712a6a345dc256606a4bf3ac523c44c4d8008 100644
--- a/framework/model/network/wifi/bus/hdf_pcie_intf.c
+++ b/framework/model/network/wifi/bus/hdf_pcie_intf.c
@@ -9,7 +9,7 @@
 #include "hdf_base.h"
 #include "hdf_dlist.h"
 #include "hdf_ibus_intf.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "pcie_if.h"
 #include "securec.h"
diff --git a/framework/model/network/wifi/bus/hdf_sdio_intf.c b/framework/model/network/wifi/bus/hdf_sdio_intf.c
index feef991f6d97623758dffa807111aae4d6c600b9..4d10cf02977134cadbfe6e9df2a995954005ef7c 100644
--- a/framework/model/network/wifi/bus/hdf_sdio_intf.c
+++ b/framework/model/network/wifi/bus/hdf_sdio_intf.c
@@ -12,7 +12,7 @@
 #include "hdf_wlan_sdio.h"
 #include "hdf_base.h"
 #include "hdf_ibus_intf.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "securec.h"
 
 #define HDF_LOG_TAG HDF_WIFI_CORE
diff --git a/framework/model/network/wifi/bus/hdf_usb_intf.c b/framework/model/network/wifi/bus/hdf_usb_intf.c
index ab5cecb7eedaf215ff622714426c8f79cb767d68..e217e47f5a74c9c7c5006dfcaea5c136bcf3d52c 100644
--- a/framework/model/network/wifi/bus/hdf_usb_intf.c
+++ b/framework/model/network/wifi/bus/hdf_usb_intf.c
@@ -10,7 +10,7 @@
 #include "wifi_inc.h"
 #include "hdf_base.h"
 #include "hdf_ibus_intf.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "securec.h"
 
 #define HDF_LOG_TAG HDF_WIFI_CORE
diff --git a/framework/model/network/wifi/core/components/eapol/eapol.c b/framework/model/network/wifi/core/components/eapol/eapol.c
index 8e997dc37ea855fe2de8e42b43312c3825aba4aa..e0afec9030faf36aa0af4091969c5481599a62dc 100644
--- a/framework/model/network/wifi/core/components/eapol/eapol.c
+++ b/framework/model/network/wifi/core/components/eapol/eapol.c
@@ -10,7 +10,7 @@
 #include "securec.h"
 #include "osal_time.h"
 #include "osal_mem.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG HDF_WIFI_CORE
 
diff --git a/framework/model/network/wifi/core/hdf_wifi_core.c b/framework/model/network/wifi/core/hdf_wifi_core.c
index 4865df51a615a15b62deb7897eb4a21b7a75ef5b..d0962f04a1edd455a5b575fa77caf2e001820033 100644
--- a/framework/model/network/wifi/core/hdf_wifi_core.c
+++ b/framework/model/network/wifi/core/hdf_wifi_core.c
@@ -11,7 +11,7 @@
 #include "hdf_wifi_core.h"
 #include "devsvc_manager_clnt.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_wifi_cmd.h"
 #include "osal_mem.h"
 #include "osal_time.h"
diff --git a/framework/model/network/wifi/platform/src/hdf_wifi_event.c b/framework/model/network/wifi/platform/src/hdf_wifi_event.c
index 122d4c3cd815c2de873dfaaaafaa24c8a43efcc6..0d2f99eb4eefefc048ea18d415755acb869ae81c 100644
--- a/framework/model/network/wifi/platform/src/hdf_wifi_event.c
+++ b/framework/model/network/wifi/platform/src/hdf_wifi_event.c
@@ -7,7 +7,7 @@
  */
 
 #include "hdf_wifi_event.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_sbuf.h"
 #include "hdf_slist.h"
 #include "hdf_wifi_product.h"
diff --git a/framework/model/network/wifi/platform/src/hdf_wlan_chipdriver_manager.c b/framework/model/network/wifi/platform/src/hdf_wlan_chipdriver_manager.c
index 9b74712d516388bdc586ef28822cf98bcce9ab29..8147b2eac35336e3b634492ff5caec123eda6046 100644
--- a/framework/model/network/wifi/platform/src/hdf_wlan_chipdriver_manager.c
+++ b/framework/model/network/wifi/platform/src/hdf_wlan_chipdriver_manager.c
@@ -9,7 +9,7 @@
 #include "hdf_wlan_chipdriver_manager.h"
 #include "gpio_if.h"
 #include "osal_mem.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "wifi_module.h"
 #include "securec.h"
 
diff --git a/framework/model/network/wifi/platform/src/hdf_wlan_config_parser.c b/framework/model/network/wifi/platform/src/hdf_wlan_config_parser.c
index 6c40eb8a7d819263c6c838e5734ed46ef6a27afb..98567434e8db112a99e9fd979240a1476390b4fb 100644
--- a/framework/model/network/wifi/platform/src/hdf_wlan_config_parser.c
+++ b/framework/model/network/wifi/platform/src/hdf_wlan_config_parser.c
@@ -7,7 +7,7 @@
  */
 
 #include "hdf_wlan_config.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG HDF_WIFI_CORE
 static struct HdfConfigWlanRoot g_configWlanModuleRoot = { 0 };
diff --git a/framework/model/network/wifi/platform/src/hdf_wlan_power_manager.c b/framework/model/network/wifi/platform/src/hdf_wlan_power_manager.c
index 74413c2fd77ff436cb98d175d57b64107f468a12..661b90a8f3525a6c49e85d298b2390c05d8c1c1c 100644
--- a/framework/model/network/wifi/platform/src/hdf_wlan_power_manager.c
+++ b/framework/model/network/wifi/platform/src/hdf_wlan_power_manager.c
@@ -7,7 +7,7 @@
  */
 #include "gpio_if.h"
 #include "osal_mem.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "wifi_module.h"
 #include "hdf_wlan_chipdriver_manager.h"
 #include "securec.h"
diff --git a/framework/model/network/wifi/platform/src/hdf_wlan_priority_queue.c b/framework/model/network/wifi/platform/src/hdf_wlan_priority_queue.c
index 27a24bfa0c386c6fc6f2c754971138f1c92e8b9d..8d1d73911b36fa1bdb34095cec81465da16d5410 100644
--- a/framework/model/network/wifi/platform/src/hdf_wlan_priority_queue.c
+++ b/framework/model/network/wifi/platform/src/hdf_wlan_priority_queue.c
@@ -6,7 +6,7 @@
  * See the LICENSE file in the root of this repository for complete details.
  */
 #include "hdf_wlan_priority_queue.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_wlan_queue.h"
 #include "securec.h"
 #include "osal_sem.h"
diff --git a/framework/model/network/wifi/platform/src/hdf_wlan_reset_manager.c b/framework/model/network/wifi/platform/src/hdf_wlan_reset_manager.c
index 60879604c5f32ddf574fa1af3c2a8290c540502b..218ab1c8da74fa3980f441c97b154f29aaa2a532 100644
--- a/framework/model/network/wifi/platform/src/hdf_wlan_reset_manager.c
+++ b/framework/model/network/wifi/platform/src/hdf_wlan_reset_manager.c
@@ -7,7 +7,7 @@
  */
 #include "gpio_if.h"
 #include "osal_mem.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "wifi_module.h"
 #include "hdf_wlan_chipdriver_manager.h"
 #include "securec.h"
diff --git a/framework/model/network/wifi/platform/src/hdf_wlan_utils.c b/framework/model/network/wifi/platform/src/hdf_wlan_utils.c
index d2d956aa91ed1cd7b0d9890c1811c04c6158411f..0607dd2c1ad108c612a64b7edc090204f55d055d 100644
--- a/framework/model/network/wifi/platform/src/hdf_wlan_utils.c
+++ b/framework/model/network/wifi/platform/src/hdf_wlan_utils.c
@@ -8,7 +8,7 @@
 
 #include "hdf_wlan_utils.h"
 #include <securec.h>
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "wifi_module.h"
 #include "hdf_wlan_chipdriver_manager.h"
 
diff --git a/framework/model/network/wifi/platform/src/message/message_dispatcher.c b/framework/model/network/wifi/platform/src/message/message_dispatcher.c
index 562021ba98bbed82ab7671c4634b3570e49326af..94c650229badbec1b0596ceec3e2a8438e837cf7 100644
--- a/framework/model/network/wifi/platform/src/message/message_dispatcher.c
+++ b/framework/model/network/wifi/platform/src/message/message_dispatcher.c
@@ -10,7 +10,7 @@
 #include "osal_mutex.h"
 #include "osal_thread.h"
 #include "osal_time.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_wlan_priority_queue.h"
 #include "message_dispatcher.h"
 #include "message_router_inner.h"
diff --git a/framework/model/network/wifi/platform/src/message/message_router.c b/framework/model/network/wifi/platform/src/message/message_router.c
index 171a004c16cabd9a4fff4397c09052e77bcea218..cfaa8d7ba0fd9185280953c90282688f145c1fa7 100644
--- a/framework/model/network/wifi/platform/src/message/message_router.c
+++ b/framework/model/network/wifi/platform/src/message/message_router.c
@@ -12,7 +12,7 @@
 #include <unistd.h>
 #endif
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "message_dispatcher.h"
 #include "message_router_inner.h"
 #include "osal_mutex.h"
diff --git a/framework/model/network/wifi/platform/src/message/nodes/local_node.c b/framework/model/network/wifi/platform/src/message/nodes/local_node.c
index 4e7bc89ca666c443f2c6a01f87a04167145b582c..601a155458f9d71b66a55fcbeea3be1b6bd170b8 100644
--- a/framework/model/network/wifi/platform/src/message/nodes/local_node.c
+++ b/framework/model/network/wifi/platform/src/message/nodes/local_node.c
@@ -7,7 +7,7 @@
  */
 
 #include "securec.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_wlan_priority_queue.h"
 #include "message/message_types.h"
 #include "message_router_inner.h"
diff --git a/framework/model/network/wifi/platform/src/message/sidecar.c b/framework/model/network/wifi/platform/src/message/sidecar.c
index dd6c5c125887d9af10c0480f021f29217ca690cc..3866954c7b01d6a820ec7b4d03dd06bd2fe3df0e 100644
--- a/framework/model/network/wifi/platform/src/message/sidecar.c
+++ b/framework/model/network/wifi/platform/src/message/sidecar.c
@@ -8,7 +8,7 @@
 
 #include "sidecar.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "message_router.h"
 #include "message_router_inner.h"
 #include "securec.h"
diff --git a/framework/model/network/wifi/platform/src/qos/flow_control.c b/framework/model/network/wifi/platform/src/qos/flow_control.c
index b0e06377c9565db112f4a65785fd00d93d7b1718..63f31290e2c4df0523a125b7da3b7cc80b675724 100644
--- a/framework/model/network/wifi/platform/src/qos/flow_control.c
+++ b/framework/model/network/wifi/platform/src/qos/flow_control.c
@@ -10,7 +10,7 @@
 
 #include "flow_control_task.h"
 #include "securec.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "net_device.h"
 #include "net_device_adapter.h"
diff --git a/framework/model/network/wifi/platform/src/qos/flow_control_task.c b/framework/model/network/wifi/platform/src/qos/flow_control_task.c
index 1cc03bee140eb9ea95fdd45dfd539c4b3d017677..215b33b6fa402e96303d71a5f9200e7ed22e072b 100644
--- a/framework/model/network/wifi/platform/src/qos/flow_control_task.c
+++ b/framework/model/network/wifi/platform/src/qos/flow_control_task.c
@@ -8,7 +8,7 @@
 
 #include "flow_control_task.h"
 #include "osal_time.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "flow_control.h"
 #include "securec.h"
 #define HDF_LOG_TAG HDF_WIFI_CORE
diff --git a/framework/model/sensor/driver/include/sensor_platform_if.h b/framework/model/sensor/driver/include/sensor_platform_if.h
index 85ee522213b524730c4ffc35e40a25c7d6beef91..88c86173c04ffc0e85971eca109dd9f48ce60696 100755
--- a/framework/model/sensor/driver/include/sensor_platform_if.h
+++ b/framework/model/sensor/driver/include/sensor_platform_if.h
@@ -9,7 +9,7 @@
 #ifndef SENSOR_PLATFORM_IF_H
 #define SENSOR_PLATFORM_IF_H
 
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "i2c_if.h"
 #include "spi_if.h"
 #include "osal_thread.h"
diff --git a/framework/model/sensor/driver/ppg/sensor_ppg_config.h b/framework/model/sensor/driver/ppg/sensor_ppg_config.h
index 186b4754d646a3d5a1a266223fe84e351f593d3b..89205a856555980b48f248d92f5d4f66b00eba6f 100644
--- a/framework/model/sensor/driver/ppg/sensor_ppg_config.h
+++ b/framework/model/sensor/driver/ppg/sensor_ppg_config.h
@@ -13,7 +13,7 @@
 #include "hdf_device_desc.h"
 #include "spi_if.h"
 #include "gpio_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "sensor_device_type.h"
 #include "sensor_platform_if.h"
 #include "sensor_config_parser.h"
diff --git a/framework/model/storage/include/mmc/mmc_corex.h b/framework/model/storage/include/mmc/mmc_corex.h
index d6a24be2da74a99ba128299cc9760f6a9b33403b..7123167056e92814fe1f3b5538e34230f4468ae5 100644
--- a/framework/model/storage/include/mmc/mmc_corex.h
+++ b/framework/model/storage/include/mmc/mmc_corex.h
@@ -11,7 +11,7 @@
 
 #include "hdf_base.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "mmc_caps.h"
 #include "mmc_protocol.h"
 #include "osal_mem.h"
diff --git a/framework/model/storage/src/mmc/emmc_if.c b/framework/model/storage/src/mmc/emmc_if.c
index ae3310aa305d8f7c96275611c251e3f9a66c4719..c587299856678550d3af9afc643507896e41af78 100644
--- a/framework/model/storage/src/mmc/emmc_if.c
+++ b/framework/model/storage/src/mmc/emmc_if.c
@@ -13,7 +13,7 @@
 #ifdef __USER__
 #include "hdf_io_service_if.h"
 #endif
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "securec.h"
 
 #define HDF_LOG_TAG emmc_if_c
diff --git a/framework/model/storage/src/mmc/mmc_block.c b/framework/model/storage/src/mmc/mmc_block.c
index 4ffb82b61c541e86e41bc3f7bd27e49e140c9ea0..7426894315c136684f52f4ae43185cba9c47264b 100644
--- a/framework/model/storage/src/mmc/mmc_block.c
+++ b/framework/model/storage/src/mmc/mmc_block.c
@@ -9,7 +9,7 @@
 #include "securec.h"
 
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "mmc_block.h"
 
 #define HDF_LOG_TAG mmc_block_c
diff --git a/framework/model/storage/src/mmc/mmc_dispatch.c b/framework/model/storage/src/mmc/mmc_dispatch.c
index 8e2211f777adb31df21de2bd4a7c7f9525b35ef7..3a854aa8bb08654fd8ac58c85892ecfd80da1771 100644
--- a/framework/model/storage/src/mmc/mmc_dispatch.c
+++ b/framework/model/storage/src/mmc/mmc_dispatch.c
@@ -7,7 +7,7 @@
  */
 
 #include "mmc_dispatch.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "mmc_corex.h"
 #include "mmc_emmc.h"
 #include "mmc_sdio.h"
diff --git a/framework/model/storage/src/mmc/mmc_if.c b/framework/model/storage/src/mmc/mmc_if.c
index 94b1d6283f43b12ce23f4a8f91218fecfb256460..16c3b97a34e42e67ad1a3097c8817c0737305c47 100644
--- a/framework/model/storage/src/mmc/mmc_if.c
+++ b/framework/model/storage/src/mmc/mmc_if.c
@@ -13,7 +13,7 @@
 #ifdef __USER__
 #include "hdf_io_service_if.h"
 #endif
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "securec.h"
 
diff --git a/framework/model/storage/src/mmc/sdio_if.c b/framework/model/storage/src/mmc/sdio_if.c
index dc33ea9fbe567cac1f0b0c8279da602348b3c58a..fedf0516b8ca6c6c746d5209781fc00cf37dde5c 100644
--- a/framework/model/storage/src/mmc/sdio_if.c
+++ b/framework/model/storage/src/mmc/sdio_if.c
@@ -8,7 +8,7 @@
 
 #include "sdio_if.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "mmc_sdio.h"
 #include "osal_mem.h"
 #include "securec.h"
diff --git a/framework/model/storage/src/mtd/mtd_block.c b/framework/model/storage/src/mtd/mtd_block.c
index 9a140c5df0505fe9c904ef86f922134030d09938..ea9cf1489b16284d116cf099089a177a960bd413 100644
--- a/framework/model/storage/src/mtd/mtd_block.c
+++ b/framework/model/storage/src/mtd/mtd_block.c
@@ -6,7 +6,7 @@
  * See the LICENSE file in the root of this repository for complete details.
  */
 
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "mtd_core.h"
 
 __attribute__((weak)) int32_t MtdBlockOsInit(struct MtdDevice *mtdDevice)
diff --git a/framework/model/storage/src/mtd/mtd_core.c b/framework/model/storage/src/mtd/mtd_core.c
index 68bea3f20e8e71d7e635750f05375a2d0e921ef0..fcd9f1bc9b63ef25c6654db0112b3460ad517e13 100644
--- a/framework/model/storage/src/mtd/mtd_core.c
+++ b/framework/model/storage/src/mtd/mtd_core.c
@@ -9,7 +9,7 @@
 #include "mtd_core.h"
 #include "securec.h"
 
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "mtd_block.h"
 #include "mtd_char.h"
 #include "platform_core.h"
diff --git a/framework/model/storage/src/mtd/mtd_spi_common.c b/framework/model/storage/src/mtd/mtd_spi_common.c
index 3619cc49c5e1c25add5e21a4dedd34274c851529..e2b1e1704d46d941d0eaa7d191c5eae9141402ae 100644
--- a/framework/model/storage/src/mtd/mtd_spi_common.c
+++ b/framework/model/storage/src/mtd/mtd_spi_common.c
@@ -7,7 +7,7 @@
  */
 
 #include "mtd_spi_common.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 static void SpiFlashDumpDefualt(struct MtdDevice *mtdDevice)
 {
diff --git a/framework/model/usb/src/usb_ddk_pnp_loader.c b/framework/model/usb/src/usb_ddk_pnp_loader.c
index 59217e33c8c3616c65d444ff40438f747b3fecee..bc3d98214a996bbb88a604dba26ce3d6dfc8f28a 100644
--- a/framework/model/usb/src/usb_ddk_pnp_loader.c
+++ b/framework/model/usb/src/usb_ddk_pnp_loader.c
@@ -15,7 +15,7 @@
 #include "hdf_cstring.h"
 #include "hdf_device_node.h"
 #include "hdf_device_object.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_dlist.h"
 #include "hdf_sbuf.h"
 #include "osal_file.h"
diff --git a/framework/model/usb/src/usb_wrapper.cpp b/framework/model/usb/src/usb_wrapper.cpp
index 6ac0cd969c32601c36691b1b9a3b5f006b95c1f2..a6427825129785cfe1f2d4b2d342b42494bee1d7 100644
--- a/framework/model/usb/src/usb_wrapper.cpp
+++ b/framework/model/usb/src/usb_wrapper.cpp
@@ -8,7 +8,7 @@
 
 #include "usb_wrapper.h"
 
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_usb_pnp_manage.h"
 
 #ifdef USB_ENABLE_HISYSEVENT
diff --git a/framework/sample/platform/uart/dev/hello_uart_dev.c b/framework/sample/platform/uart/dev/hello_uart_dev.c
index ce00aeda7a4e986b9b0a560215721bdb09fe36e8..9a62d5b0e3ff795fcbfdbd35045193b12a090567 100644
--- a/framework/sample/platform/uart/dev/hello_uart_dev.c
+++ b/framework/sample/platform/uart/dev/hello_uart_dev.c
@@ -9,7 +9,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG hello_uart
 #define INFO_SIZE   16
diff --git a/framework/sample/platform/uart/dispatch/hello_uart_dispatch.c b/framework/sample/platform/uart/dispatch/hello_uart_dispatch.c
index 4061fe80c8170c3b0da5667111d2464eae6ffe28..05d7900785164cec28314ebb435c92570cfc9780 100644
--- a/framework/sample/platform/uart/dispatch/hello_uart_dispatch.c
+++ b/framework/sample/platform/uart/dispatch/hello_uart_dispatch.c
@@ -7,7 +7,7 @@
  */
 
 #include <string.h>
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "uart_if.h"
 
diff --git a/framework/sample/platform/uart/dispatch/uart_if.c b/framework/sample/platform/uart/dispatch/uart_if.c
index 5dd9d144ae61e57718e57baa4336f6918a830c45..1318f540259925259b2f91f72099ce1cf61d5589 100644
--- a/framework/sample/platform/uart/dispatch/uart_if.c
+++ b/framework/sample/platform/uart/dispatch/uart_if.c
@@ -8,7 +8,7 @@
 
 #include "uart_if.h"
 #include "hdf_io_service_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 
 #define HDF_LOG_TAG uart_if
diff --git a/framework/sample/platform/uart/src/uart_dev_sample.c b/framework/sample/platform/uart/src/uart_dev_sample.c
index 7e7da2dd50f87f3f35e24206cf0c405d3255af24..ff52da8596777de13bb398c7704c2e10a2a8ce47 100644
--- a/framework/sample/platform/uart/src/uart_dev_sample.c
+++ b/framework/sample/platform/uart/src/uart_dev_sample.c
@@ -8,7 +8,7 @@
 
 #include "uart_dev_sample.h"
 #include "fs/fs.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "securec.h"
 #include "uart_pl011_sample.h"
diff --git a/framework/sample/platform/uart/src/uart_dispatch_sample.c b/framework/sample/platform/uart/src/uart_dispatch_sample.c
index e069b7c5f94a9c02cb91d7d78ba69b51b8965d59..a0891a7f0e53ff527d97e40f7f3952aaa5128559 100644
--- a/framework/sample/platform/uart/src/uart_dispatch_sample.c
+++ b/framework/sample/platform/uart/src/uart_dispatch_sample.c
@@ -7,7 +7,7 @@
  */
 
 #include "uart_dispatch_sample.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_sbuf.h"
 #include "uart_core.h"
 #include "uart_pl011_sample.h"
diff --git a/framework/sample/platform/uart/src/uart_sample.c b/framework/sample/platform/uart/src/uart_sample.c
index 9dc9f24abda60bc4c4bf650b76255202803e5d5b..417a792dc3ef8575707d738fb9adaf7d10792532 100644
--- a/framework/sample/platform/uart/src/uart_sample.c
+++ b/framework/sample/platform/uart/src/uart_sample.c
@@ -9,7 +9,7 @@
 #include "buf_fifo.h"
 #include "device_resource_if.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hisoc/uart.h"
 #include "osal_io.h"
 #include "osal_mem.h"
diff --git a/framework/support/platform/include/fwk/platform_log.h b/framework/support/platform/include/fwk/platform_log.h
index ab097fb147dba1610ec41d1a11da1fb1534afaeb..dafc0d8e4b6fbd04931452a4e8562661653b5282 100644
--- a/framework/support/platform/include/fwk/platform_log.h
+++ b/framework/support/platform/include/fwk/platform_log.h
@@ -9,7 +9,7 @@
 #ifndef PLATFORM_LOG_H
 #define PLATFORM_LOG_H
 
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #if defined(__LITEOS__) || defined(__KERNEL__)
 #define PLAT_LOGV(fmt, arg...)
diff --git a/framework/support/platform/include/regulator/regulator_tree_mgr.h b/framework/support/platform/include/regulator/regulator_tree_mgr.h
index eecd4b2f2a40b1086fb239adcf2ecad28ca50534..be9decde70e5515096f0d3af8569c817cccdec4f 100644
--- a/framework/support/platform/include/regulator/regulator_tree_mgr.h
+++ b/framework/support/platform/include/regulator/regulator_tree_mgr.h
@@ -10,7 +10,7 @@
 #define REGULATOR_TREE_MGR_H
 
 #include "regulator_core.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_base.h"
 #include "osal_mutex.h"
 
diff --git a/framework/support/platform/src/adc/adc_core.c b/framework/support/platform/src/adc/adc_core.c
index dcf333b3b2ee6db7cf5c35141c579128b2b3a76b..7c39ab3410cbae716aa9d6c22e818ed156699b2b 100644
--- a/framework/support/platform/src/adc/adc_core.c
+++ b/framework/support/platform/src/adc/adc_core.c
@@ -8,7 +8,7 @@
 
 #include "adc_core.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "osal_spinlock.h"
 #include "osal_time.h"
diff --git a/framework/support/platform/src/adc/adc_if.c b/framework/support/platform/src/adc/adc_if.c
index 83dd41f820461986d8520377188db10ee84be6a1..518964d7f28ce3085722b89e3339b2daca6b5ff9 100644
--- a/framework/support/platform/src/adc/adc_if.c
+++ b/framework/support/platform/src/adc/adc_if.c
@@ -8,7 +8,7 @@
 
 #include "adc_if.h"
 #include "adc_core.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "securec.h"
 #define HDF_LOG_TAG adc_if_c
diff --git a/framework/support/platform/src/adc/adc_if_u.c b/framework/support/platform/src/adc/adc_if_u.c
index 2d4ddecf4c87b5ea180b479cafbde7024d671ebb..c83956865e67a8ed6e3dff03e0b3b3b34a8fd93b 100644
--- a/framework/support/platform/src/adc/adc_if_u.c
+++ b/framework/support/platform/src/adc/adc_if_u.c
@@ -7,7 +7,7 @@
  */
 
 #include "hdf_io_service_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "adc_if.h"
 
 #define HDF_LOG_TAG adc_if_u_c
diff --git a/framework/support/platform/src/can/can_mail.c b/framework/support/platform/src/can/can_mail.c
index 0f949d3a1915fa2aa5e5ab42f3abf79feea7995b..3379f5914534fe58a164f775c61af1db03f19cc9 100644
--- a/framework/support/platform/src/can/can_mail.c
+++ b/framework/support/platform/src/can/can_mail.c
@@ -9,7 +9,7 @@
 #include "can/can_mail.h"
 #include "can/can_msg.h"
 #include "hdf_dlist.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 
 #define HDF_LOG_TAG can_mail
diff --git a/framework/support/platform/src/can/can_msg.c b/framework/support/platform/src/can/can_msg.c
index 1b1b41880a5019ed6d0ba85dad161d5a109294bd..11dae157d0eeeda88c172a4fe9c007ef2e55bd68 100644
--- a/framework/support/platform/src/can/can_msg.c
+++ b/framework/support/platform/src/can/can_msg.c
@@ -8,7 +8,7 @@
 
 #include "can/can_msg.h"
 #include "hdf_dlist.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_atomic.h"
 #include "osal_mem.h"
 #include "osal_time.h"
diff --git a/framework/support/platform/src/clock/clock_core.c b/framework/support/platform/src/clock/clock_core.c
index 58e4f6dcf01a19d69f69e2cfbed0f2675b563730..6e9bc5b260c41cfc5f6efdcfe07ed153f51e5947 100644
--- a/framework/support/platform/src/clock/clock_core.c
+++ b/framework/support/platform/src/clock/clock_core.c
@@ -8,7 +8,7 @@
 
 #include "clock_core.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "osal_spinlock.h"
 #include "osal_time.h"
diff --git a/framework/support/platform/src/clock/clock_if.c b/framework/support/platform/src/clock/clock_if.c
index 9100142095f0c847a4d965ce0081daf52dbf3a90..11bc98e6442c06b8e7c7dbe09a9657df9a8c3d6e 100644
--- a/framework/support/platform/src/clock/clock_if.c
+++ b/framework/support/platform/src/clock/clock_if.c
@@ -8,7 +8,7 @@
 
 #include "clock_if.h"
 #include "clock_core.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "securec.h"
 #define HDF_LOG_TAG clock_if_c
diff --git a/framework/support/platform/src/clock/clock_if_u.c b/framework/support/platform/src/clock/clock_if_u.c
index 1888469d6a6a290dd800a87381bf2b3520f3d951..f3624b5ef0124ff864d5c3df0c0b16d24c80b94f 100644
--- a/framework/support/platform/src/clock/clock_if_u.c
+++ b/framework/support/platform/src/clock/clock_if_u.c
@@ -7,7 +7,7 @@
  */
 
 #include "hdf_io_service_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "clock_if.h"
 
 #define HDF_LOG_TAG clock_if_u_c
diff --git a/framework/support/platform/src/dac/dac_core.c b/framework/support/platform/src/dac/dac_core.c
index 107d5870c2aee99e1386dacc13f2e9b6cd492f01..247886818de013a5ca2228d0c3cb06758a17c3b6 100644
--- a/framework/support/platform/src/dac/dac_core.c
+++ b/framework/support/platform/src/dac/dac_core.c
@@ -8,7 +8,7 @@
 
 #include "dac_core.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "osal_spinlock.h"
 #include "osal_time.h"
diff --git a/framework/support/platform/src/dac/dac_if.c b/framework/support/platform/src/dac/dac_if.c
index 3b9eedaec40a5c0bbd867375f931f8269c6e6b87..5bbc89bcf8b66108d2f8d03b71f81e625ef1b56a 100644
--- a/framework/support/platform/src/dac/dac_if.c
+++ b/framework/support/platform/src/dac/dac_if.c
@@ -8,7 +8,7 @@
 
 #include "dac_if.h"
 #include "dac_core.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #define HDF_LOG_TAG dac_if_c
 #define DAC_SERVICE_NAME "HDF_PLATFORM_DAC_MANAGER"
 
diff --git a/framework/support/platform/src/dac/dac_if_u.c b/framework/support/platform/src/dac/dac_if_u.c
index 96bc08b664f616100d33cb8dcc6bad2f41c3e49e..c94540d74ce4dfe61f1c92c66b01ebc14467ceb8 100644
--- a/framework/support/platform/src/dac/dac_if_u.c
+++ b/framework/support/platform/src/dac/dac_if_u.c
@@ -9,7 +9,7 @@
 #include "dac_if.h"
 #include "hdf_io_service_if.h"
 #include "platform_core.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "securec.h"
 
diff --git a/framework/support/platform/src/dma/dmac_core.c b/framework/support/platform/src/dma/dmac_core.c
index ced6c517fa290219f9a7ea5a4ff705c2ed6df9be..8ff09b3371c00591143de3cfac6c8b2207e42e98 100644
--- a/framework/support/platform/src/dma/dmac_core.c
+++ b/framework/support/platform/src/dma/dmac_core.c
@@ -8,7 +8,7 @@
 
 #include "dmac_core.h"
 #include <string.h>
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_io.h"
 #include "osal_irq.h"
 #include "osal_mem.h"
diff --git a/framework/support/platform/src/fwk/platform_common.c b/framework/support/platform/src/fwk/platform_common.c
index 774a84bc9a6fccabd47ee4daaf5158b2b90538fd..5bc0c585f62d717640138f95691518560cf11e02 100644
--- a/framework/support/platform/src/fwk/platform_common.c
+++ b/framework/support/platform/src/fwk/platform_common.c
@@ -6,7 +6,7 @@
  * See the LICENSE file in the root of this repository for complete details.
  */
 
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_spinlock.h"
 #include "platform_core.h"
 
diff --git a/framework/support/platform/src/fwk/platform_device.c b/framework/support/platform/src/fwk/platform_device.c
index 83641be59ad11edb693964ffc55afdffffdca874..a1a7814e18acd0c92931971377ed156d96ca185d 100644
--- a/framework/support/platform/src/fwk/platform_device.c
+++ b/framework/support/platform/src/fwk/platform_device.c
@@ -7,7 +7,7 @@
  */
 
 #include "platform_device.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "platform_core.h"
 #include "securec.h"
diff --git a/framework/support/platform/src/fwk/platform_dumper.c b/framework/support/platform/src/fwk/platform_dumper.c
index ce3d9b024b50f7cf3c87924ba06c02eaab685640..93fa1cd734a6f02ee895704ee90c6e9e3f65987e 100644
--- a/framework/support/platform/src/fwk/platform_dumper.c
+++ b/framework/support/platform/src/fwk/platform_dumper.c
@@ -6,7 +6,7 @@
  * See the LICENSE file in the root of this repository for complete details.
  */
 #include "platform_dumper.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_io.h"
 #include "osal_mem.h"
 #include "osal_sem.h"
diff --git a/framework/support/platform/src/fwk/platform_listener_u.c b/framework/support/platform/src/fwk/platform_listener_u.c
index b67f4d7567cb16f5eaa24f345de1543907c48384..b9d66bb5c5e1b1df45278363cbc94e19ad1d84d4 100644
--- a/framework/support/platform/src/fwk/platform_listener_u.c
+++ b/framework/support/platform/src/fwk/platform_listener_u.c
@@ -7,7 +7,7 @@
  */
 
 #include "platform_listener_u.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "platform_listener_common.h"
 #include "securec.h"
diff --git a/framework/support/platform/src/fwk/platform_manager.c b/framework/support/platform/src/fwk/platform_manager.c
index 32abba8aeee21e3a17a2477ecdbeaa1ccdeb7388..6ec438bcb6207fe67e3a0fc3aa2533c3df3f09b5 100644
--- a/framework/support/platform/src/fwk/platform_manager.c
+++ b/framework/support/platform/src/fwk/platform_manager.c
@@ -7,7 +7,7 @@
  */
 
 #include "platform_manager.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "osal_sem.h"
 #include "platform_core.h"
diff --git a/framework/support/platform/src/fwk/platform_queue.c b/framework/support/platform/src/fwk/platform_queue.c
index 4b17e583081eee1f5600aa47d1fad7e24821683b..770b807af9bc5186214266b1a6908a4db31d6d17 100644
--- a/framework/support/platform/src/fwk/platform_queue.c
+++ b/framework/support/platform/src/fwk/platform_queue.c
@@ -7,7 +7,7 @@
  */
 
 #include "platform_queue.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "osal_mutex.h"
 #include "osal_thread.h"
diff --git a/framework/support/platform/src/fwk/platform_trace_transfer.c b/framework/support/platform/src/fwk/platform_trace_transfer.c
index 2bbf76316d5920a5da30c4eb32364b9416122cda..1d22fe533b5d37b4951a47bdd4eea819b42d8465 100644
--- a/framework/support/platform/src/fwk/platform_trace_transfer.c
+++ b/framework/support/platform/src/fwk/platform_trace_transfer.c
@@ -6,7 +6,7 @@
  * See the LICENSE file in the root of this repository for complete details.
  */
 
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "platform_trace.h"
 static struct PlatformTraceModuleExplain g_traceModuleExplain[] = {
     {PLATFORM_TRACE_MODULE_I2S,                "PLATFORM_TRACE_MODULE_I2S"               },
diff --git a/framework/support/platform/src/hdmi/hdmi_cec.c b/framework/support/platform/src/hdmi/hdmi_cec.c
index fcc83b766e5507a17df1fe3bc3b79170f95a5d97..017c99aa102e6fe26e768062991fd0c169fac869 100644
--- a/framework/support/platform/src/hdmi/hdmi_cec.c
+++ b/framework/support/platform/src/hdmi/hdmi_cec.c
@@ -6,7 +6,7 @@
  * See the LICENSE file in the root of this repository for complete details.
  */
 
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdmi_core.h"
 #include "securec.h"
 
diff --git a/framework/support/platform/src/hdmi/hdmi_common.c b/framework/support/platform/src/hdmi/hdmi_common.c
index d53116c0d28a26cf81fa5d10a48c76ae26c0f612..4a55f82ad42571f8ac4568608e4818c5a94d3683 100644
--- a/framework/support/platform/src/hdmi/hdmi_common.c
+++ b/framework/support/platform/src/hdmi/hdmi_common.c
@@ -7,7 +7,7 @@
  */
 
 #include "hdmi_common.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG hdmi_common_c
 
diff --git a/framework/support/platform/src/hdmi/hdmi_core.c b/framework/support/platform/src/hdmi/hdmi_core.c
index 995ad55b3deed081862245ed06230f1ddbe35458..32a5bd6082c07094a9e1c868d13cfbcc475642a7 100644
--- a/framework/support/platform/src/hdmi/hdmi_core.c
+++ b/framework/support/platform/src/hdmi/hdmi_core.c
@@ -8,7 +8,7 @@
 
 #include "hdmi_core.h"
 #include "device_resource_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdmi_dispatch.h"
 #include "osal_mem.h"
 #include "osal_time.h"
diff --git a/framework/support/platform/src/hdmi/hdmi_dfm.c b/framework/support/platform/src/hdmi/hdmi_dfm.c
index 2e083d5cd0e733244af213c695908010c4680ae9..f554ea1c6fff06fdc385851b0192833c5fcdd3d1 100644
--- a/framework/support/platform/src/hdmi/hdmi_dfm.c
+++ b/framework/support/platform/src/hdmi/hdmi_dfm.c
@@ -7,7 +7,7 @@
  */
 
 #include "hdmi_dfm.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdmi_common.h"
 
 #define HDF_LOG_TAG hdmi_dfm_c
diff --git a/framework/support/platform/src/hdmi/hdmi_dispatch.c b/framework/support/platform/src/hdmi/hdmi_dispatch.c
index 6d90c635e15f77279bf2ee86a7660f88992b20df..9a176367a4eb25f7da0be4daaba5634729b20565 100644
--- a/framework/support/platform/src/hdmi/hdmi_dispatch.c
+++ b/framework/support/platform/src/hdmi/hdmi_dispatch.c
@@ -7,7 +7,7 @@
  */
 
 #include "hdmi_dispatch.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdmi_core.h"
 #include "hdmi_if.h"
 
diff --git a/framework/support/platform/src/hdmi/hdmi_edid.c b/framework/support/platform/src/hdmi/hdmi_edid.c
index e3d56d3e75a773c491a6bba4012fd2efc5463ec9..464e6ee64b44543f600091722565cab402963aa1 100644
--- a/framework/support/platform/src/hdmi/hdmi_edid.c
+++ b/framework/support/platform/src/hdmi/hdmi_edid.c
@@ -6,7 +6,7 @@
  * See the LICENSE file in the root of this repository for complete details.
  */
 
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdmi_core.h"
 #include "securec.h"
 
diff --git a/framework/support/platform/src/hdmi/hdmi_event.c b/framework/support/platform/src/hdmi/hdmi_event.c
index 87de39f377be23c8627b5e15c645716a8ce155d2..b3b18006c35fc09c3f8c171f56421a49bffa7abe 100644
--- a/framework/support/platform/src/hdmi/hdmi_event.c
+++ b/framework/support/platform/src/hdmi/hdmi_event.c
@@ -6,7 +6,7 @@
  * See the LICENSE file in the root of this repository for complete details.
  */
 
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdmi_core.h"
 #include "osal_mem.h"
 
diff --git a/framework/support/platform/src/hdmi/hdmi_frl.c b/framework/support/platform/src/hdmi/hdmi_frl.c
index ff867c0ec34fe7a82ad561af93a437af879deb8a..f6523f21438c6c22c5f39a52ad0d07b70ca5b005 100644
--- a/framework/support/platform/src/hdmi/hdmi_frl.c
+++ b/framework/support/platform/src/hdmi/hdmi_frl.c
@@ -6,7 +6,7 @@
  * See the LICENSE file in the root of this repository for complete details.
  */
 
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdmi_common.h"
 #include "hdmi_core.h"
 #include "hdmi_dfm.h"
diff --git a/framework/support/platform/src/hdmi/hdmi_hdcp.c b/framework/support/platform/src/hdmi/hdmi_hdcp.c
index 0874830932618931894a8a4025da5bd124e2092a..82b22b6e83248227a62f4a8feeefadcf2b56ee31 100644
--- a/framework/support/platform/src/hdmi/hdmi_hdcp.c
+++ b/framework/support/platform/src/hdmi/hdmi_hdcp.c
@@ -6,7 +6,7 @@
  * See the LICENSE file in the root of this repository for complete details.
  */
 
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdmi_core.h"
 
 #define HDF_LOG_TAG hdmi_hdcp_c
diff --git a/framework/support/platform/src/hdmi/hdmi_hdr.c b/framework/support/platform/src/hdmi/hdmi_hdr.c
index 616e0858dac5a2355dd64fba7e6969121a6bad9f..5b75ebcd56b47280ea798e9c0917fcf057c236a3 100644
--- a/framework/support/platform/src/hdmi/hdmi_hdr.c
+++ b/framework/support/platform/src/hdmi/hdmi_hdr.c
@@ -6,7 +6,7 @@
  * See the LICENSE file in the root of this repository for complete details.
  */
 
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdmi_core.h"
 #include "securec.h"
 
diff --git a/framework/support/platform/src/hdmi/hdmi_if.c b/framework/support/platform/src/hdmi/hdmi_if.c
index cc52131f588eb79032a3e0ac40275f7559456b3a..cee6b2747e47dd33d9c4d18f74e457d30af37b19 100644
--- a/framework/support/platform/src/hdmi/hdmi_if.c
+++ b/framework/support/platform/src/hdmi/hdmi_if.c
@@ -11,7 +11,7 @@
 #include "hdmi_core.h"
 #endif
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #ifdef __USER__
 #include "hdf_io_service_if.h"
diff --git a/framework/support/platform/src/hdmi/hdmi_infoframe.c b/framework/support/platform/src/hdmi/hdmi_infoframe.c
index c724e53d7c5899408b7353cf42612fbadd6f6f29..7909e1c6c9b4206395fc67f31d7c695a519ae423 100644
--- a/framework/support/platform/src/hdmi/hdmi_infoframe.c
+++ b/framework/support/platform/src/hdmi/hdmi_infoframe.c
@@ -6,7 +6,7 @@
  * See the LICENSE file in the root of this repository for complete details.
  */
 
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdmi_core.h"
 #include "securec.h"
 
diff --git a/framework/support/platform/src/hdmi/hdmi_scdc.c b/framework/support/platform/src/hdmi/hdmi_scdc.c
index 9d97112dee2963c7e66450643c8d7e8741ce0bb9..01469fc8aa23b64c2a52bcc831fbfaa85e481beb 100644
--- a/framework/support/platform/src/hdmi/hdmi_scdc.c
+++ b/framework/support/platform/src/hdmi/hdmi_scdc.c
@@ -6,7 +6,7 @@
  * See the LICENSE file in the root of this repository for complete details.
  */
 
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdmi_core.h"
 
 #define HDF_LOG_TAG hdmi_scdc_c
diff --git a/framework/support/platform/src/i2c/i2c_core.c b/framework/support/platform/src/i2c/i2c_core.c
index 6afcd4e9aa1a86b77204eacb150b79c59fb37b37..11fcf4921f9ff7714358e39afcec10a6cb5233c4 100644
--- a/framework/support/platform/src/i2c/i2c_core.c
+++ b/framework/support/platform/src/i2c/i2c_core.c
@@ -7,7 +7,7 @@
  */
 #include "i2c_core.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "i2c_msg.h"
 #include "i2c_service.h"
 #include "osal_mem.h"
diff --git a/framework/support/platform/src/i2c/i2c_if.c b/framework/support/platform/src/i2c/i2c_if.c
index eabd034ee7ba8eab2b3f7e7144bb54688e18a8f4..40a9d30772b490bf2b447d199626e811d42f31e4 100644
--- a/framework/support/platform/src/i2c/i2c_if.c
+++ b/framework/support/platform/src/i2c/i2c_if.c
@@ -9,7 +9,7 @@
 #include "i2c_if.h"
 #include "devsvc_manager_clnt.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "i2c_core.h"
 #include "osal_mem.h"
 #include "securec.h"
diff --git a/framework/support/platform/src/i2c/i2c_if_u.c b/framework/support/platform/src/i2c/i2c_if_u.c
index 0e08432252c72b1b26d80aa748b33b797e2847a3..3d0f608ef97b98c439b500e61b2584eca87941d8 100644
--- a/framework/support/platform/src/i2c/i2c_if_u.c
+++ b/framework/support/platform/src/i2c/i2c_if_u.c
@@ -8,7 +8,7 @@
 
 #include "hdf_base.h"
 #include "hdf_io_service_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "i2c_if.h"
 #include "i2c_service.h"
 #include "osal_mem.h"
diff --git a/framework/support/platform/src/i2s/i2s_core.c b/framework/support/platform/src/i2s/i2s_core.c
index 6cf76d740532154c3464ece0be5294f34f41550c..08e2358f9e386dc4e77155e75f572eceee91f281 100644
--- a/framework/support/platform/src/i2s/i2s_core.c
+++ b/framework/support/platform/src/i2s/i2s_core.c
@@ -7,7 +7,7 @@
  */
 
 #include "i2s_core.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "platform_trace.h"
 
diff --git a/framework/support/platform/src/i2s/i2s_if.c b/framework/support/platform/src/i2s/i2s_if.c
index 7969179b5bd7e17f55be23cb5cbda5eb57e57bea..2a90c7bf338f38c77f93d2d8367b006aeb9c7b60 100644
--- a/framework/support/platform/src/i2s/i2s_if.c
+++ b/framework/support/platform/src/i2s/i2s_if.c
@@ -8,7 +8,7 @@
 
 #include "i2s_if.h"
 #include "devsvc_manager_clnt.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "osal_time.h"
 #include "securec.h"
diff --git a/framework/support/platform/src/i3c/i3c_core.c b/framework/support/platform/src/i3c/i3c_core.c
index ae0cd235556de284c9a38173156084f39593e06d..ad74c67cf5e6ad06c6c82e86733a7cf611a962e6 100644
--- a/framework/support/platform/src/i3c/i3c_core.c
+++ b/framework/support/platform/src/i3c/i3c_core.c
@@ -8,7 +8,7 @@
 
 #include "i3c_core.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "osal_mutex.h"
 
diff --git a/framework/support/platform/src/i3c/i3c_if.c b/framework/support/platform/src/i3c/i3c_if.c
index 2ec155dc795819d4aa72ade217e6bb9306b7860d..09337373a8e5236f2ba98472878e9320bffcf228 100644
--- a/framework/support/platform/src/i3c/i3c_if.c
+++ b/framework/support/platform/src/i3c/i3c_if.c
@@ -8,7 +8,7 @@
 
 #include "i3c_if.h"
 #include "i3c_core.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG i3c_if_c
 
diff --git a/framework/support/platform/src/mipi/mipi_csi_core.c b/framework/support/platform/src/mipi/mipi_csi_core.c
index 2b7e101d1d778c6e48d3c13bf0f8b3573afd8ff9..7fb0bc94ee3f6f73632eb70ff485f04f10c5a29a 100644
--- a/framework/support/platform/src/mipi/mipi_csi_core.c
+++ b/framework/support/platform/src/mipi/mipi_csi_core.c
@@ -7,7 +7,7 @@
  */
 
 #include "mipi_csi_core.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG mipi_csi_core
 
diff --git a/framework/support/platform/src/mipi/mipi_dsi_core.c b/framework/support/platform/src/mipi/mipi_dsi_core.c
index e95d06cdaaae9784d4fe1ffe4cf2543d763bdab0..ebac35519d1af70ba84caa1604a7247b361ee544 100644
--- a/framework/support/platform/src/mipi/mipi_dsi_core.c
+++ b/framework/support/platform/src/mipi/mipi_dsi_core.c
@@ -7,7 +7,7 @@
  */
 
 #include "mipi_dsi_core.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "osal_time.h"
 
diff --git a/framework/support/platform/src/pcie/pcie_core.c b/framework/support/platform/src/pcie/pcie_core.c
index a870f6337218d14947adac542df86281c2bb106c..4c282166b4cca8a6c0e49a2d16d197876f565dc7 100644
--- a/framework/support/platform/src/pcie/pcie_core.c
+++ b/framework/support/platform/src/pcie/pcie_core.c
@@ -8,7 +8,7 @@
 
 #include "pcie_core.h"
 #include "device_resource_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "pcie_dispatch.h"
 #include "securec.h"
diff --git a/framework/support/platform/src/pcie/pcie_dispatch.c b/framework/support/platform/src/pcie/pcie_dispatch.c
index 5b58042ee28e6345e08954de619e3b9360ed3731..2d3d54fe9b2e77abb13cb62ec9416f6263c52a0a 100644
--- a/framework/support/platform/src/pcie/pcie_dispatch.c
+++ b/framework/support/platform/src/pcie/pcie_dispatch.c
@@ -7,7 +7,7 @@
  */
 
 #include "pcie_dispatch.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "pcie_core.h"
 #include "pcie_if.h"
diff --git a/framework/support/platform/src/pcie/pcie_if.c b/framework/support/platform/src/pcie/pcie_if.c
index dca8f0a9f347d0a9bc3c3563a45cc36bd09938ac..c017a63537b6eeba1a596a57a926afd061b31c46 100644
--- a/framework/support/platform/src/pcie/pcie_if.c
+++ b/framework/support/platform/src/pcie/pcie_if.c
@@ -10,7 +10,7 @@
 #include "devsvc_manager_clnt.h"
 #include "pcie_core.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 
 #define HDF_LOG_TAG pcie_if_c
diff --git a/framework/support/platform/src/pcie/pcie_if_u.c b/framework/support/platform/src/pcie/pcie_if_u.c
index e8b0d24833f26f44a7fa214daf52b46a5e74bf4b..e21dd88542ecb9934076cd3d8f4a5ecf6843685d 100644
--- a/framework/support/platform/src/pcie/pcie_if_u.c
+++ b/framework/support/platform/src/pcie/pcie_if_u.c
@@ -9,7 +9,7 @@
 #include "pcie_if.h"
 #include "hdf_base.h"
 #include "hdf_io_service_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "platform_listener_u.h"
 #include "securec.h"
diff --git a/framework/support/platform/src/pin/pin_core.c b/framework/support/platform/src/pin/pin_core.c
index 87d6a6665c186c5d5e5f505a624752ef1ddb199f..b440ce43f0c0467387f7dc431ecffa16f03f9350 100644
--- a/framework/support/platform/src/pin/pin_core.c
+++ b/framework/support/platform/src/pin/pin_core.c
@@ -7,7 +7,7 @@
  */
 
 #include "pin/pin_core.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "pin_if.h"
 #include "platform_trace.h"
diff --git a/framework/support/platform/src/pin/pin_if.c b/framework/support/platform/src/pin/pin_if.c
index ef1e985201642cac2cdb2e0bfe449bf29ffa4797..805c0a167bbf4afa2dd2fb1454804e5469439c3e 100644
--- a/framework/support/platform/src/pin/pin_if.c
+++ b/framework/support/platform/src/pin/pin_if.c
@@ -8,7 +8,7 @@
 
 #include "pin_if.h"
 #include "pin_core.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG pin_if
 
diff --git a/framework/support/platform/src/pwm/pwm_core.c b/framework/support/platform/src/pwm/pwm_core.c
index 291298802426ef34b9c75387567e2bc1eb0fd673..bee2c52e4f67701b2a12204375ab3008cd63ae4d 100644
--- a/framework/support/platform/src/pwm/pwm_core.c
+++ b/framework/support/platform/src/pwm/pwm_core.c
@@ -7,7 +7,7 @@
  */
 
 #include "pwm_core.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "securec.h"
 
 #define HDF_LOG_TAG pwm_core
diff --git a/framework/support/platform/src/pwm/pwm_if.c b/framework/support/platform/src/pwm/pwm_if.c
index bad355e6f3e275a15e47cfbd099468d83e528190..de55c16d29fe89e655a819cbd2da6562153198a5 100644
--- a/framework/support/platform/src/pwm/pwm_if.c
+++ b/framework/support/platform/src/pwm/pwm_if.c
@@ -6,7 +6,7 @@
  * See the LICENSE file in the root of this repository for complete details.
  */
 
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "pwm_core.h"
 #include "securec.h"
diff --git a/framework/support/platform/src/pwm/pwm_if_u.c b/framework/support/platform/src/pwm/pwm_if_u.c
index 69e231fd2bc5b0b95f8bf0403a18e5fc901cad53..56a94d0565a48ebc93a3f5e3a21efce4db469434 100644
--- a/framework/support/platform/src/pwm/pwm_if_u.c
+++ b/framework/support/platform/src/pwm/pwm_if_u.c
@@ -7,7 +7,7 @@
  */
 
 #include "pwm_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_io_service_if.h"
 #include "securec.h"
 
diff --git a/framework/support/platform/src/regulator/regulator_core.c b/framework/support/platform/src/regulator/regulator_core.c
index a4d97778bf399498831fc6c64690b0650216067a..35828c40b9f1c2eeef8f02f87aaa0b7c5fdbc1b6 100644
--- a/framework/support/platform/src/regulator/regulator_core.c
+++ b/framework/support/platform/src/regulator/regulator_core.c
@@ -7,7 +7,7 @@
  */
 
 #include "regulator_core.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "osal_time.h"
 #include "securec.h"
diff --git a/framework/support/platform/src/regulator/regulator_if.c b/framework/support/platform/src/regulator/regulator_if.c
index 70af11838419e24ddfa590a645bf635a7db48d9f..e93813a93ef0a54a3b9173c9c0657000ea786052 100644
--- a/framework/support/platform/src/regulator/regulator_if.c
+++ b/framework/support/platform/src/regulator/regulator_if.c
@@ -6,7 +6,7 @@
  * See the LICENSE file in the root of this repository for complete details.
  */
 #include "regulator_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "regulator_core.h"
 
 DevHandle RegulatorOpen(const char *name)
diff --git a/framework/support/platform/src/rtc/rtc_core.c b/framework/support/platform/src/rtc/rtc_core.c
index df38d6f8ca1338d948bc2ebbf71d706fe8c1e24d..3b836f68ae8d471ed30ccf3a98725c3fcad0318d 100644
--- a/framework/support/platform/src/rtc/rtc_core.c
+++ b/framework/support/platform/src/rtc/rtc_core.c
@@ -7,7 +7,7 @@
  */
 
 #include "rtc_core.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "rtc_if.h"
 
diff --git a/framework/support/platform/src/rtc/rtc_if.c b/framework/support/platform/src/rtc/rtc_if.c
index 4a8c641a1ce8605c4717710a7da9ef74952ab5eb..54e1e67bcc0cf6f026ef5d542e90f72c26188a04 100644
--- a/framework/support/platform/src/rtc/rtc_if.c
+++ b/framework/support/platform/src/rtc/rtc_if.c
@@ -8,7 +8,7 @@
 
 #include "rtc_if.h"
 #include "devsvc_manager_clnt.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "rtc_base.h"
 #include "rtc_core.h"
diff --git a/framework/support/platform/src/rtc/rtc_if_u.c b/framework/support/platform/src/rtc/rtc_if_u.c
index 55b38387bceccfe9e728c91f82e9fcbfe5a8c3a0..cc28bb904053a54e856be0db28ee0cc3658bb87a 100644
--- a/framework/support/platform/src/rtc/rtc_if_u.c
+++ b/framework/support/platform/src/rtc/rtc_if_u.c
@@ -8,7 +8,7 @@
 
 #include "rtc_if.h"
 #include "hdf_io_service_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_sbuf.h"
 #include "osal_mem.h"
 #include "platform_listener_u.h"
diff --git a/framework/support/platform/src/rtc/rtc_service.c b/framework/support/platform/src/rtc/rtc_service.c
index 6481883c257cfe629f736493b7a9035fe12a41cc..51548eec9d4516b4639fed961cfc52a54f25f883 100644
--- a/framework/support/platform/src/rtc/rtc_service.c
+++ b/framework/support/platform/src/rtc/rtc_service.c
@@ -9,7 +9,7 @@
 #include "devsvc_manager_clnt.h"
 #include "hdf_device_desc.h"
 #include "hdf_device_object.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "platform_listener_common.h"
 #include "rtc_core.h"
diff --git a/framework/support/platform/src/spi/spi_core.c b/framework/support/platform/src/spi/spi_core.c
index dec5a87a32e3cea8713f31d71416ea3d4fe42d0a..cefbe03136ea0aa3d6a4db6fa51d7334dcb3d018 100644
--- a/framework/support/platform/src/spi/spi_core.c
+++ b/framework/support/platform/src/spi/spi_core.c
@@ -7,7 +7,7 @@
  */
 
 #include "spi_core.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "spi_if.h"
 #include "spi_service.h"
diff --git a/framework/support/platform/src/spi/spi_if.c b/framework/support/platform/src/spi/spi_if.c
index 551c9c445edf28468cb56c84057f2a4202e15f64..c51e7c33036a7de9933775c6a283f9f081333a25 100644
--- a/framework/support/platform/src/spi/spi_if.c
+++ b/framework/support/platform/src/spi/spi_if.c
@@ -8,7 +8,7 @@
 
 #include "spi_if.h"
 #include "devsvc_manager_clnt.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "securec.h"
 #include "spi_core.h"
diff --git a/framework/support/platform/src/spi/spi_if_u.c b/framework/support/platform/src/spi/spi_if_u.c
index 7d3cf466965db9a9093ad257d4ce007ad1b72731..ab511bcabbb0ad37b5237ace23f4d9acf599a57d 100644
--- a/framework/support/platform/src/spi/spi_if_u.c
+++ b/framework/support/platform/src/spi/spi_if_u.c
@@ -7,7 +7,7 @@
  */
 
 #include "hdf_io_service_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "securec.h"
 #include "spi_if.h"
diff --git a/framework/support/platform/src/timer/timer_core.c b/framework/support/platform/src/timer/timer_core.c
index 6a7cb8e2d3bb8d3e9676830e7f00feca5ced586f..45485b33b38882e664593e6f8600dbcdba74778a 100644
--- a/framework/support/platform/src/timer/timer_core.c
+++ b/framework/support/platform/src/timer/timer_core.c
@@ -8,7 +8,7 @@
 
 #include "timer_core.h"
 #include "hdf_device_object.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "osal_time.h"
 #include "platform_listener_common.h"
diff --git a/framework/support/platform/src/timer/timer_if.c b/framework/support/platform/src/timer/timer_if.c
index ff8c336cf361ea4cca1d301fbf88fa2c157bcdc8..618be4628b3209f693d1a12ef56ebda630c374aa 100644
--- a/framework/support/platform/src/timer/timer_if.c
+++ b/framework/support/platform/src/timer/timer_if.c
@@ -6,7 +6,7 @@
  * See the LICENSE file in the root of this repository for complete details.
  */
 #include "timer_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "timer_core.h"
 
 DevHandle HwTimerOpen(const uint32_t number)
diff --git a/framework/support/platform/src/timer/timer_if_u.c b/framework/support/platform/src/timer/timer_if_u.c
index d2eeb21c872153908035c366ad26cac5da4b03d0..640d205a53ec29047f461c1c0cd832ebee248933 100644
--- a/framework/support/platform/src/timer/timer_if_u.c
+++ b/framework/support/platform/src/timer/timer_if_u.c
@@ -8,7 +8,7 @@
 
 #include "timer_if.h"
 #include "hdf_io_service_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "platform_listener_u.h"
 #include "securec.h"
diff --git a/framework/support/platform/src/uart/uart_core.c b/framework/support/platform/src/uart/uart_core.c
index 852fd0d1c10f3653fdb88e9bfc3177c1d5fd12c8..9d7c93ff997a68b2ec2546e5a0fe8e7b99c15359 100644
--- a/framework/support/platform/src/uart/uart_core.c
+++ b/framework/support/platform/src/uart/uart_core.c
@@ -7,7 +7,7 @@
  */
 
 #include "uart_core.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "uart_if.h"
 
diff --git a/framework/support/platform/src/uart/uart_if.c b/framework/support/platform/src/uart/uart_if.c
index a8cc06974698ce5c866cc4d49d81db5118840a07..52852a206be478e870ff19063b0fec0de3f676be 100644
--- a/framework/support/platform/src/uart/uart_if.c
+++ b/framework/support/platform/src/uart/uart_if.c
@@ -8,7 +8,7 @@
 
 #include "uart_if.h"
 #include "devsvc_manager_clnt.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "securec.h"
 #include "uart_core.h"
diff --git a/framework/support/platform/src/uart/uart_if_u.c b/framework/support/platform/src/uart/uart_if_u.c
index e679710c9904e45387a3be350de328333b232f7f..9da3afa0690a42551fe56eb64bc2bfd8d9997b0d 100644
--- a/framework/support/platform/src/uart/uart_if_u.c
+++ b/framework/support/platform/src/uart/uart_if_u.c
@@ -7,7 +7,7 @@
  */
 
 #include "hdf_io_service_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "securec.h"
 #include "uart_if.h"
 
diff --git a/framework/support/platform/src/uart/uart_service.c b/framework/support/platform/src/uart/uart_service.c
index 5d595f71fe030716951f43e2b8f76948308c86eb..ebf5bcb4a03a8721a09be94f73db412409620655 100644
--- a/framework/support/platform/src/uart/uart_service.c
+++ b/framework/support/platform/src/uart/uart_service.c
@@ -6,7 +6,7 @@
  * See the LICENSE file in the root of this repository for complete details.
  */
 
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "uart_core.h"
 #include "uart_if.h"
diff --git a/framework/support/platform/src/watchdog/watchdog_core.c b/framework/support/platform/src/watchdog/watchdog_core.c
index 757fc536197ed71c2ba4faef0407598b6bd9f64e..efb1a513e951f51b166247c555bcd6ec7c0bed7e 100644
--- a/framework/support/platform/src/watchdog/watchdog_core.c
+++ b/framework/support/platform/src/watchdog/watchdog_core.c
@@ -7,7 +7,7 @@
  */
 
 #include "watchdog_core.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "watchdog_if.h"
 #include "platform_trace.h"
 
diff --git a/framework/support/platform/src/watchdog/watchdog_if.c b/framework/support/platform/src/watchdog/watchdog_if.c
index 6d42bd437843db4e5cc54951437aaf2c6e83db54..34bf973be0443e11c571c4996c06a04349878465 100644
--- a/framework/support/platform/src/watchdog/watchdog_if.c
+++ b/framework/support/platform/src/watchdog/watchdog_if.c
@@ -9,7 +9,7 @@
 #include "watchdog_if.h"
 #include "devsvc_manager_clnt.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "securec.h"
 #include "watchdog_core.h"
diff --git a/framework/support/platform/src/watchdog/watchdog_if_u.c b/framework/support/platform/src/watchdog/watchdog_if_u.c
index 658a8cc0723821fc380b507820adb467d48744aa..a9cc57324b83c73b42ed85501660ebfd07f20dc0 100644
--- a/framework/support/platform/src/watchdog/watchdog_if_u.c
+++ b/framework/support/platform/src/watchdog/watchdog_if_u.c
@@ -9,7 +9,7 @@
 #include "watchdog_if.h"
 #include "securec.h"
 #include "hdf_io_service_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG watchdog_if_u
 
diff --git a/framework/support/platform/test/fuzztest/gpio_fuzzer/gpio_fuzzer.cpp b/framework/support/platform/test/fuzztest/gpio_fuzzer/gpio_fuzzer.cpp
index 537d3f777285de9daa364b0135d91e58c50d68f1..00cdaac4b8954d7c95c545eff57ec2512ea5c4f3 100644
--- a/framework/support/platform/test/fuzztest/gpio_fuzzer/gpio_fuzzer.cpp
+++ b/framework/support/platform/test/fuzztest/gpio_fuzzer/gpio_fuzzer.cpp
@@ -12,7 +12,7 @@
 #include "securec.h"
 #include "gpio_if.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 using namespace std;
 
diff --git a/framework/support/platform/test/fuzztest/i2c_fuzzer/i2c_fuzzer.h b/framework/support/platform/test/fuzztest/i2c_fuzzer/i2c_fuzzer.h
index f00a828c460e94866cf8c3d393e04c1a6b955b52..67ff7ad9f26c25fcdbb1aabd9a0e06e8b9480ac2 100644
--- a/framework/support/platform/test/fuzztest/i2c_fuzzer/i2c_fuzzer.h
+++ b/framework/support/platform/test/fuzztest/i2c_fuzzer/i2c_fuzzer.h
@@ -11,7 +11,7 @@
 #include <iostream>
 #include "securec.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "i2c_if.h"
 
 #define FUZZ_PROJECT_NAME "i2c_fuzzer"
diff --git a/framework/support/platform/test/fuzztest/pwm_fuzzer/pwm_fuzzer.cpp b/framework/support/platform/test/fuzztest/pwm_fuzzer/pwm_fuzzer.cpp
index a515c1ed1ebbb193cf4185034f852774d1a1789c..240fea7a4d648663b8e4fc766f11dbcb8ca157f2 100644
--- a/framework/support/platform/test/fuzztest/pwm_fuzzer/pwm_fuzzer.cpp
+++ b/framework/support/platform/test/fuzztest/pwm_fuzzer/pwm_fuzzer.cpp
@@ -11,7 +11,7 @@
 #include "random.h"
 #include "securec.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "pwm_if.h"
 
 using namespace std;
diff --git a/framework/support/platform/test/fuzztest/rtc_fuzzer/rtc_fuzzer.cpp b/framework/support/platform/test/fuzztest/rtc_fuzzer/rtc_fuzzer.cpp
index ae3075099f9b281ed8a89d85077a8ea0e42ccdf6..6a574cedaf88bc6ebd0f53dfa0da6013967c21e7 100644
--- a/framework/support/platform/test/fuzztest/rtc_fuzzer/rtc_fuzzer.cpp
+++ b/framework/support/platform/test/fuzztest/rtc_fuzzer/rtc_fuzzer.cpp
@@ -11,7 +11,7 @@
 #include "random.h"
 #include "securec.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "rtc_if.h"
 
 using namespace std;
diff --git a/framework/support/platform/test/fuzztest/spi_fuzzer/spi_fuzzer.cpp b/framework/support/platform/test/fuzztest/spi_fuzzer/spi_fuzzer.cpp
index 03a837174a9499bd66129a7736ee9959c929ce52..3a2cbe6c62de43acc93b20a9ca2efb7f6a2beba4 100644
--- a/framework/support/platform/test/fuzztest/spi_fuzzer/spi_fuzzer.cpp
+++ b/framework/support/platform/test/fuzztest/spi_fuzzer/spi_fuzzer.cpp
@@ -10,7 +10,7 @@
 #include "random.h"
 #include "securec.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "spi_if.h"
 #include "spi_fuzzer.h"
 
diff --git a/framework/support/platform/test/fuzztest/uart_fuzzer/uart_fuzzer.cpp b/framework/support/platform/test/fuzztest/uart_fuzzer/uart_fuzzer.cpp
index c8e5367fb822a88b5685f6ff74d7b1501bd6c897..26bbca1c315d10b061e77463a6fbc1486c7058f3 100644
--- a/framework/support/platform/test/fuzztest/uart_fuzzer/uart_fuzzer.cpp
+++ b/framework/support/platform/test/fuzztest/uart_fuzzer/uart_fuzzer.cpp
@@ -11,7 +11,7 @@
 #include "random.h"
 #include "securec.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "uart_if.h"
 
 using namespace std;
diff --git a/framework/support/platform/test/fuzztest/watchdog_fuzzer/watchdog_fuzzer.h b/framework/support/platform/test/fuzztest/watchdog_fuzzer/watchdog_fuzzer.h
index f418a41b86f02c5458dafedea8b1403689c33aa6..5f2af0ce2175d668ea9513128669eb7ba69441a6 100644
--- a/framework/support/platform/test/fuzztest/watchdog_fuzzer/watchdog_fuzzer.h
+++ b/framework/support/platform/test/fuzztest/watchdog_fuzzer/watchdog_fuzzer.h
@@ -12,7 +12,7 @@
 #include <iostream>
 #include "watchdog_if.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define FUZZ_PROJECT_NAME "watchdog_fuzzer"
 
diff --git a/framework/support/posix/src/osal_mem.c b/framework/support/posix/src/osal_mem.c
index 3dbf564718015390310e2ce3ef17fa8cb0f62f87..11fb21f0a041f6e11b38f2e5e0fccd4da3278fbb 100644
--- a/framework/support/posix/src/osal_mem.c
+++ b/framework/support/posix/src/osal_mem.c
@@ -9,7 +9,7 @@
 #include "osal_mem.h"
 #include <stdlib.h>
 #include "securec.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG osal_mem
 
diff --git a/framework/support/posix/src/osal_mutex.c b/framework/support/posix/src/osal_mutex.c
index d01420e7d0cbc12a92e8ce0b5d870ffba4462cf9..3ae0ba84313851abcb052078e9fdc35a5cad0239 100644
--- a/framework/support/posix/src/osal_mutex.c
+++ b/framework/support/posix/src/osal_mutex.c
@@ -9,7 +9,7 @@
 #include "osal_mutex.h"
 #include <pthread.h>
 #include "securec.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 
 #define HDF_LOG_TAG osal_mutex
diff --git a/framework/support/posix/src/osal_sem.c b/framework/support/posix/src/osal_sem.c
index 47457bfc710224810e2f17fa43c2e3bc930dc9bb..3514616a929bd1d24bc1db903133b474049ee0b0 100644
--- a/framework/support/posix/src/osal_sem.c
+++ b/framework/support/posix/src/osal_sem.c
@@ -11,7 +11,7 @@
 #include <semaphore.h>
 #include <time.h>
 #include "securec.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 
 const int32_t SHARE = 0;
diff --git a/framework/support/posix/src/osal_spinlock.c b/framework/support/posix/src/osal_spinlock.c
index e51b7ff9095f69a6d67179a3bbfa641bc1b4ec8d..6980d231fd404e79a29aa526366a3b040c1120b4 100644
--- a/framework/support/posix/src/osal_spinlock.c
+++ b/framework/support/posix/src/osal_spinlock.c
@@ -8,7 +8,7 @@
 
 #include "osal_spinlock.h"
 #include <pthread.h>
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 
 #define HDF_LOG_TAG osal_spinlock
diff --git a/framework/support/posix/src/osal_thread.c b/framework/support/posix/src/osal_thread.c
index d8202699daf98bef8ab4b18c3a84edacfa74ed6c..7371cf3b22425a36361178343aa4d79e0b7bc003 100644
--- a/framework/support/posix/src/osal_thread.c
+++ b/framework/support/posix/src/osal_thread.c
@@ -11,7 +11,7 @@
 #include <securec.h>
 
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "osal_thread.h"
 #ifndef PTHREAD_STACK_MIN
diff --git a/framework/support/posix/src/osal_time.c b/framework/support/posix/src/osal_time.c
index fd00e9d4dcf8f5aba0c1bede93c68e0fddeb149f..49bf71606fe56a7db7d8eccf8d955b7079b83cb6 100644
--- a/framework/support/posix/src/osal_time.c
+++ b/framework/support/posix/src/osal_time.c
@@ -12,7 +12,7 @@
 #include <time.h>
 #include <unistd.h>
 #include "securec.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG osal_time
 
diff --git a/framework/test/fuzztest/devicemanagerstart_fuzzer/devicemanagerstart_fuzzer.cpp b/framework/test/fuzztest/devicemanagerstart_fuzzer/devicemanagerstart_fuzzer.cpp
index c635f6ff83cd656112b1f46deb4b0e2329927861..7386a62c8853e06e1a4314d2bf7497daed601e1c 100644
--- a/framework/test/fuzztest/devicemanagerstart_fuzzer/devicemanagerstart_fuzzer.cpp
+++ b/framework/test/fuzztest/devicemanagerstart_fuzzer/devicemanagerstart_fuzzer.cpp
@@ -9,7 +9,7 @@
 #include "devicemanagerstart_fuzzer.h"
 
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/framework/test/fuzztest/devmgr_c_fuzzer/queryusabledeviceInfo_fuzzer/queryusabledeviceInfo_fuzzer.cpp b/framework/test/fuzztest/devmgr_c_fuzzer/queryusabledeviceInfo_fuzzer/queryusabledeviceInfo_fuzzer.cpp
index 417e8ba2f567757167a1bbc94e42788b53af4361..733f6c12869ae8488925dc4378c6531ee3b6017b 100644
--- a/framework/test/fuzztest/devmgr_c_fuzzer/queryusabledeviceInfo_fuzzer/queryusabledeviceInfo_fuzzer.cpp
+++ b/framework/test/fuzztest/devmgr_c_fuzzer/queryusabledeviceInfo_fuzzer/queryusabledeviceInfo_fuzzer.cpp
@@ -11,7 +11,7 @@
 #include <cstdint>
 #include <hdf_base.h>
 #include "devmgr_hdi.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "parcel.h"
 
 namespace OHOS {
diff --git a/framework/test/fuzztest/devmgr_c_fuzzer/unloaddevice_fuzzer/unloaddevice_fuzzer.cpp b/framework/test/fuzztest/devmgr_c_fuzzer/unloaddevice_fuzzer/unloaddevice_fuzzer.cpp
index 2fd109481922cad68fd069bc695744c1b06099f9..52d8876e471c14cd3e83ecc56845aa5a2d6e9ce4 100644
--- a/framework/test/fuzztest/devmgr_c_fuzzer/unloaddevice_fuzzer/unloaddevice_fuzzer.cpp
+++ b/framework/test/fuzztest/devmgr_c_fuzzer/unloaddevice_fuzzer/unloaddevice_fuzzer.cpp
@@ -11,7 +11,7 @@
 #include <cstdint>
 #include <hdf_base.h>
 #include "devmgr_hdi.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "parcel.h"
 
 namespace OHOS {
diff --git a/framework/test/fuzztest/devmgr_cpp_fuzzer/loaddevice_fuzzer/loaddevice_fuzzer.cpp b/framework/test/fuzztest/devmgr_cpp_fuzzer/loaddevice_fuzzer/loaddevice_fuzzer.cpp
index 7f2a454ad9a92bc4b80cb3aa7a1350a84611e919..417d3d695c62ebf2246b3298c7a9d92a8e684ac9 100644
--- a/framework/test/fuzztest/devmgr_cpp_fuzzer/loaddevice_fuzzer/loaddevice_fuzzer.cpp
+++ b/framework/test/fuzztest/devmgr_cpp_fuzzer/loaddevice_fuzzer/loaddevice_fuzzer.cpp
@@ -10,7 +10,7 @@
 #include <cstddef>
 #include <cstdint>
 #include <hdf_base.h>
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "idevmgr_hdi.h"
 #include "parcel.h"
 
diff --git a/framework/test/fuzztest/devmgr_cpp_fuzzer/unloaddevice_fuzzer/unloaddevice_fuzzer.cpp b/framework/test/fuzztest/devmgr_cpp_fuzzer/unloaddevice_fuzzer/unloaddevice_fuzzer.cpp
index b8adca5633b57da2b71a31b1765ddb42bc88ed28..0ff2fc606fc14ccc54f884cea67e0ecf8bb63779 100644
--- a/framework/test/fuzztest/devmgr_cpp_fuzzer/unloaddevice_fuzzer/unloaddevice_fuzzer.cpp
+++ b/framework/test/fuzztest/devmgr_cpp_fuzzer/unloaddevice_fuzzer/unloaddevice_fuzzer.cpp
@@ -10,7 +10,7 @@
 #include <cstddef>
 #include <cstdint>
 #include <hdf_base.h>
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include <hdi_base.h>
 #include "idevmgr_hdi.h"
 #include "parcel.h"
diff --git a/framework/test/fuzztest/devmgr_service_fuzzer/service_fuzzer.cpp b/framework/test/fuzztest/devmgr_service_fuzzer/service_fuzzer.cpp
index 83851488bca319acd0e236e11531df3a772175d6..ac83a8311a047dd4d8e36d7ebc2bad217999d18e 100644
--- a/framework/test/fuzztest/devmgr_service_fuzzer/service_fuzzer.cpp
+++ b/framework/test/fuzztest/devmgr_service_fuzzer/service_fuzzer.cpp
@@ -9,7 +9,7 @@
 #include "service_fuzzer.h"
 
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/framework/test/fuzztest/devmgrservicestub_fuzzer/devmgrservicestub_fuzzer.cpp b/framework/test/fuzztest/devmgrservicestub_fuzzer/devmgrservicestub_fuzzer.cpp
index f58c8fc9fa2ed5aed50a9e0887c8c666b885ae96..800db94ee3b7b16ff67bc7203b50b0d0254d4b1b 100644
--- a/framework/test/fuzztest/devmgrservicestub_fuzzer/devmgrservicestub_fuzzer.cpp
+++ b/framework/test/fuzztest/devmgrservicestub_fuzzer/devmgrservicestub_fuzzer.cpp
@@ -9,7 +9,7 @@
 #include "devmgrservicestub_fuzzer.h"
 #include "devmgr_service_stub.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 extern "C" int32_t DevmgrServiceStubDispatch(
     struct HdfRemoteService *stub, int code, struct HdfSBuf *data, struct HdfSBuf *reply);
diff --git a/framework/test/fuzztest/devsvcmanagerstub_fuzzer/devsvcmanagerstub_fuzzer.cpp b/framework/test/fuzztest/devsvcmanagerstub_fuzzer/devsvcmanagerstub_fuzzer.cpp
index 587dd8bf0041714aaa59d3267b82a94ea287e00d..af59cc9f6d02c3ff64e9ff4952575f5cf27e780e 100644
--- a/framework/test/fuzztest/devsvcmanagerstub_fuzzer/devsvcmanagerstub_fuzzer.cpp
+++ b/framework/test/fuzztest/devsvcmanagerstub_fuzzer/devsvcmanagerstub_fuzzer.cpp
@@ -9,7 +9,7 @@
 #include "devsvcmanagerstub_fuzzer.h"
 #include "devsvc_manager_proxy.h"
 #include "devsvc_manager_stub.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 extern "C" int DevSvcManagerStubDispatch(
     struct HdfRemoteService *service, int code, struct HdfSBuf *data, struct HdfSBuf *reply);
diff --git a/framework/test/fuzztest/framework_fuzzer/hcs_fuzzer/hcs_fuzzer.cpp b/framework/test/fuzztest/framework_fuzzer/hcs_fuzzer/hcs_fuzzer.cpp
index 59f3435e2340f311f0b638b487a07335a996768e..ed994643027b1154e50e05e03f2e7ac2c21c123b 100644
--- a/framework/test/fuzztest/framework_fuzzer/hcs_fuzzer/hcs_fuzzer.cpp
+++ b/framework/test/fuzztest/framework_fuzzer/hcs_fuzzer/hcs_fuzzer.cpp
@@ -10,7 +10,7 @@
 
 #include "hcs_tree_if.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "securec.h"
 
 namespace OHOS {
diff --git a/framework/test/fuzztest/framework_fuzzer/support/posix_fuzzer/posix_fuzzer.cpp b/framework/test/fuzztest/framework_fuzzer/support/posix_fuzzer/posix_fuzzer.cpp
index 91baa98c3ffbe9af257d65b0d63c3666408cfc06..6836317e36d6e55db92cea804e589467d30a655d 100644
--- a/framework/test/fuzztest/framework_fuzzer/support/posix_fuzzer/posix_fuzzer.cpp
+++ b/framework/test/fuzztest/framework_fuzzer/support/posix_fuzzer/posix_fuzzer.cpp
@@ -7,7 +7,7 @@
  */
 
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "osal_sem.h"
 #include "osal_time.h"
diff --git a/framework/test/fuzztest/ioservice_fuzzer/ioserviceadapterobtain_fuzzer/ioserviceadapterobtain_fuzzer.cpp b/framework/test/fuzztest/ioservice_fuzzer/ioserviceadapterobtain_fuzzer/ioserviceadapterobtain_fuzzer.cpp
index 6a2d53eb15fcfa21c41b932128b293f82567ddf6..5f72dfeb986caf6c6fda5d926195b6238b154727 100644
--- a/framework/test/fuzztest/ioservice_fuzzer/ioserviceadapterobtain_fuzzer/ioserviceadapterobtain_fuzzer.cpp
+++ b/framework/test/fuzztest/ioservice_fuzzer/ioserviceadapterobtain_fuzzer/ioserviceadapterobtain_fuzzer.cpp
@@ -11,7 +11,7 @@
 
 #include "hdf_base.h"
 #include "hdf_io_service.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "parcel.h"
 #include "ioserviceadapterobtain_fuzzer.h"
 
diff --git a/framework/test/fuzztest/ioservice_fuzzer/ioservicebind_fuzzer/ioservicebind_fuzzer.cpp b/framework/test/fuzztest/ioservice_fuzzer/ioservicebind_fuzzer/ioservicebind_fuzzer.cpp
index 70a3925e02cb9083a06dfd0545b376e9a9fd1684..e4ea102ab3863c969dc4f7643f54e0af018c9ae7 100644
--- a/framework/test/fuzztest/ioservice_fuzzer/ioservicebind_fuzzer/ioservicebind_fuzzer.cpp
+++ b/framework/test/fuzztest/ioservice_fuzzer/ioservicebind_fuzzer/ioservicebind_fuzzer.cpp
@@ -11,7 +11,7 @@
 #include <cstdint>
 #include "hdf_base.h"
 #include "hdf_io_service.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "parcel.h"
 
 namespace OHOS {
diff --git a/framework/test/fuzztest/ioservice_fuzzer/ioservicegrouplisten_fuzzer/ioservicegrouplisten_fuzzer.cpp b/framework/test/fuzztest/ioservice_fuzzer/ioservicegrouplisten_fuzzer/ioservicegrouplisten_fuzzer.cpp
index 6dbe25fe9466f25cd25826ea40d8cae328910041..8ff263c457e821b8c37c6ea9114c815f78203670 100644
--- a/framework/test/fuzztest/ioservice_fuzzer/ioservicegrouplisten_fuzzer/ioservicegrouplisten_fuzzer.cpp
+++ b/framework/test/fuzztest/ioservice_fuzzer/ioservicegrouplisten_fuzzer/ioservicegrouplisten_fuzzer.cpp
@@ -8,7 +8,7 @@
 
 #include "ioservicegrouplisten_fuzzer.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_io_service.h"
 #include "osal_time.h"
 #include "parcel.h"
diff --git a/framework/test/fuzztest/ioservice_fuzzer/ioservicelisten_fuzzer/ioservicelisten_fuzzer.cpp b/framework/test/fuzztest/ioservice_fuzzer/ioservicelisten_fuzzer/ioservicelisten_fuzzer.cpp
index 5ceb70d6acdceb7bf2375acef1737a6cbaec5044..566800999ab28c92c386352b86a72b0aefb963ed 100644
--- a/framework/test/fuzztest/ioservice_fuzzer/ioservicelisten_fuzzer/ioservicelisten_fuzzer.cpp
+++ b/framework/test/fuzztest/ioservice_fuzzer/ioservicelisten_fuzzer/ioservicelisten_fuzzer.cpp
@@ -10,7 +10,7 @@
 #include <cstddef>
 #include <cstdint>
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_io_service.h"
 #include "osal_time.h"
 #include "parcel.h"
diff --git a/framework/test/fuzztest/ioservice_fuzzer/ioservicenamegetbydeviceclass_fuzzer/ioservicenamegetbydeviceclass_fuzzer.cpp b/framework/test/fuzztest/ioservice_fuzzer/ioservicenamegetbydeviceclass_fuzzer/ioservicenamegetbydeviceclass_fuzzer.cpp
index ec4ec941e9973cad49fb4583a3b2f107681227e6..8185e2573d2e7e3a83cf9bfc002441dd3bb63440 100644
--- a/framework/test/fuzztest/ioservice_fuzzer/ioservicenamegetbydeviceclass_fuzzer/ioservicenamegetbydeviceclass_fuzzer.cpp
+++ b/framework/test/fuzztest/ioservice_fuzzer/ioservicenamegetbydeviceclass_fuzzer/ioservicenamegetbydeviceclass_fuzzer.cpp
@@ -11,7 +11,7 @@
 #include <cstdint>
 #include <hdf_sbuf.h>
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_io_service_if.h"
 
 namespace OHOS {
diff --git a/framework/test/fuzztest/ioservice_fuzzer/ioservicepublish_fuzzer/ioservicepublish_fuzzer.cpp b/framework/test/fuzztest/ioservice_fuzzer/ioservicepublish_fuzzer/ioservicepublish_fuzzer.cpp
index 7bdf02e73da1442023ac719b65705367b4c6748e..c1af862bd1b464c9ed9bd0b0be1996364dae49cf 100644
--- a/framework/test/fuzztest/ioservice_fuzzer/ioservicepublish_fuzzer/ioservicepublish_fuzzer.cpp
+++ b/framework/test/fuzztest/ioservice_fuzzer/ioservicepublish_fuzzer/ioservicepublish_fuzzer.cpp
@@ -11,7 +11,7 @@
 
 #include "hdf_base.h"
 #include "hdf_io_service.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "parcel.h"
 #include "ioservicepublish_fuzzer.h"
 
diff --git a/framework/test/fuzztest/ioservice_fuzzer/ioserviceremove_fuzzer/ioserviceremove_fuzzer.cpp b/framework/test/fuzztest/ioservice_fuzzer/ioserviceremove_fuzzer/ioserviceremove_fuzzer.cpp
index d3928a5ce277c3e87e715b8043f3eb8bbd420267..0588363aae270ac8e4971bf948f2d9507d99e0b0 100644
--- a/framework/test/fuzztest/ioservice_fuzzer/ioserviceremove_fuzzer/ioserviceremove_fuzzer.cpp
+++ b/framework/test/fuzztest/ioservice_fuzzer/ioserviceremove_fuzzer/ioserviceremove_fuzzer.cpp
@@ -8,7 +8,7 @@
 
 #include "ioserviceremove_fuzzer.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_io_service.h"
 #include "parcel.h"
 
diff --git a/framework/test/fuzztest/ioservice_fuzzer/loaddriverbyservicename_fuzzer/loaddriverbyservicename_fuzzer.cpp b/framework/test/fuzztest/ioservice_fuzzer/loaddriverbyservicename_fuzzer/loaddriverbyservicename_fuzzer.cpp
index 21787a190655825cf0762a18b93604cefd66107c..7dedab72a544f72ff23450d6419065edc8f7feb8 100644
--- a/framework/test/fuzztest/ioservice_fuzzer/loaddriverbyservicename_fuzzer/loaddriverbyservicename_fuzzer.cpp
+++ b/framework/test/fuzztest/ioservice_fuzzer/loaddriverbyservicename_fuzzer/loaddriverbyservicename_fuzzer.cpp
@@ -11,7 +11,7 @@
 
 #include "hdf_base.h"
 #include "hdf_io_service.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "parcel.h"
 #include "loaddriverbyservicename_fuzzer.h"
 
diff --git a/framework/test/fuzztest/servmgr_c_fuzzer/listservicebyinterfacedesc_fuzzer/listservicebyinterfacedesc_fuzzer.cpp b/framework/test/fuzztest/servmgr_c_fuzzer/listservicebyinterfacedesc_fuzzer/listservicebyinterfacedesc_fuzzer.cpp
index 9efaf68feaf4c9a54a2427e89d3a0c80a7904ce2..6091561c611cd65cc6f376431b6cdb15300ca284 100644
--- a/framework/test/fuzztest/servmgr_c_fuzzer/listservicebyinterfacedesc_fuzzer/listservicebyinterfacedesc_fuzzer.cpp
+++ b/framework/test/fuzztest/servmgr_c_fuzzer/listservicebyinterfacedesc_fuzzer/listservicebyinterfacedesc_fuzzer.cpp
@@ -10,7 +10,7 @@
 #include <cstddef>
 #include <cstdint>
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "parcel.h"
 #include "servmgr_hdi.h"
 
diff --git a/framework/test/fuzztest/servmgr_cpp_fuzzer/servstatlistenerstub_fuzzer/servstatlistenerstub_fuzzer.cpp b/framework/test/fuzztest/servmgr_cpp_fuzzer/servstatlistenerstub_fuzzer/servstatlistenerstub_fuzzer.cpp
index 6db7eadb26ba4bef782d574c7cfe4206b054f052..eebb30bf6662fd75acf0df27c9ad009f4f6583f4 100644
--- a/framework/test/fuzztest/servmgr_cpp_fuzzer/servstatlistenerstub_fuzzer/servstatlistenerstub_fuzzer.cpp
+++ b/framework/test/fuzztest/servmgr_cpp_fuzzer/servstatlistenerstub_fuzzer/servstatlistenerstub_fuzzer.cpp
@@ -10,7 +10,7 @@
 #include <cstddef>
 #include <cstdint>
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "iservstat_listener_hdi.h"
 
 using namespace OHOS::HDI::ServiceManager::V1_0;
diff --git a/framework/test/fuzztest/servmgr_cpp_fuzzer/unregisterservicestatuslistener_fuzzer/unregisterservicestatuslistener_fuzzer.cpp b/framework/test/fuzztest/servmgr_cpp_fuzzer/unregisterservicestatuslistener_fuzzer/unregisterservicestatuslistener_fuzzer.cpp
index de7ff778d4114584225bf4e9f25bdc3417a881f5..b689d8c0999d5319c09c569ff178ce9eb828aa57 100644
--- a/framework/test/fuzztest/servmgr_cpp_fuzzer/unregisterservicestatuslistener_fuzzer/unregisterservicestatuslistener_fuzzer.cpp
+++ b/framework/test/fuzztest/servmgr_cpp_fuzzer/unregisterservicestatuslistener_fuzzer/unregisterservicestatuslistener_fuzzer.cpp
@@ -13,7 +13,7 @@
 #include <hdi_base.h>
 #include <iremote_broker.h>
 #include <refbase.h>
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "iservmgr_hdi.h"
 #include "iservstat_listener_hdi.h"
 #include "parcel.h"
diff --git a/framework/test/fuzztest/syscall_fuzzer/syscall_fuzzer/syscall_fuzzer.cpp b/framework/test/fuzztest/syscall_fuzzer/syscall_fuzzer/syscall_fuzzer.cpp
index b8b81e218cdcf04775623fe81524ca6dd7d688a1..33853980cba923bae0e7383887b1fea71aadc7e4 100644
--- a/framework/test/fuzztest/syscall_fuzzer/syscall_fuzzer/syscall_fuzzer.cpp
+++ b/framework/test/fuzztest/syscall_fuzzer/syscall_fuzzer/syscall_fuzzer.cpp
@@ -6,7 +6,7 @@
  * See the LICENSE file in the root of this repository for complete details.
  */
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include <string>
 #include "hdf_io_service_if.h"
 #include "syscall_fuzzer.h"
diff --git a/framework/test/fuzztest/uhdf2_ipc_fuzzer/ipc_fuzzer/hdfipc_fuzzer.cpp b/framework/test/fuzztest/uhdf2_ipc_fuzzer/ipc_fuzzer/hdfipc_fuzzer.cpp
index a0ab10e197db31f4bd0bc8106471e05e95128d76..b127b6095cf707e2875471fc2964f275a665d431 100644
--- a/framework/test/fuzztest/uhdf2_ipc_fuzzer/ipc_fuzzer/hdfipc_fuzzer.cpp
+++ b/framework/test/fuzztest/uhdf2_ipc_fuzzer/ipc_fuzzer/hdfipc_fuzzer.cpp
@@ -8,7 +8,7 @@
 
 #include "hdfipc_fuzzer.h"
 #include "hdf_remote_adapter.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "parcel.h"
 #include <cstddef>
 #include <cstdint>
diff --git a/framework/test/fuzztest/uhdf2_utils_fuzzer/hdfxcollie_fuzzer/hdfxcollie_fuzzer.cpp b/framework/test/fuzztest/uhdf2_utils_fuzzer/hdfxcollie_fuzzer/hdfxcollie_fuzzer.cpp
index 762c971c0dc6bea2743d680373d43f80f8031cc0..899721282fa63cb2c69fa22d8c5c8c92fa38b14c 100644
--- a/framework/test/fuzztest/uhdf2_utils_fuzzer/hdfxcollie_fuzzer/hdfxcollie_fuzzer.cpp
+++ b/framework/test/fuzztest/uhdf2_utils_fuzzer/hdfxcollie_fuzzer/hdfxcollie_fuzzer.cpp
@@ -10,7 +10,7 @@
 
 #include "hdf_xcollie.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #define HDF_LOG_TAG hdfxcollie_fuzzer
 
 static int HdfXCollieFuzzTest()
diff --git a/framework/test/fuzztest/uhdf2_utils_fuzzer/inner_api_utils_fuzzer/innerapi_utils_fuzzer.cpp b/framework/test/fuzztest/uhdf2_utils_fuzzer/inner_api_utils_fuzzer/innerapi_utils_fuzzer.cpp
index 08357112b5a76b19a4a190f37f2a5916a92d9e59..8f88a1d19eff5017dc14aaa356a0024269b785eb 100644
--- a/framework/test/fuzztest/uhdf2_utils_fuzzer/inner_api_utils_fuzzer/innerapi_utils_fuzzer.cpp
+++ b/framework/test/fuzztest/uhdf2_utils_fuzzer/inner_api_utils_fuzzer/innerapi_utils_fuzzer.cpp
@@ -10,7 +10,7 @@
 
 #include "hdf_dlist.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 namespace OHOS {
 constexpr size_t THRESHOLD = 10;
diff --git a/framework/test/unittest/common/hdf_main_test.c b/framework/test/unittest/common/hdf_main_test.c
index b00936ab365aa7528ffcd06ae40a0a4a31914a2a..5859f44325ff692a3f31ebf8a925398b84240a27 100644
--- a/framework/test/unittest/common/hdf_main_test.c
+++ b/framework/test/unittest/common/hdf_main_test.c
@@ -10,7 +10,7 @@
 
 #include "hdf_base.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hcs_parser_test.h"
 #include "osal_test_entry.h"
 
diff --git a/framework/test/unittest/manager/sample_driver_test.c b/framework/test/unittest/manager/sample_driver_test.c
index 6e1abe80e9fc67aff04941412c1691a7ef4b1f44..3f0896267af025c9c7d40dcd3e44c3a17d134b6f 100644
--- a/framework/test/unittest/manager/sample_driver_test.c
+++ b/framework/test/unittest/manager/sample_driver_test.c
@@ -9,7 +9,7 @@
 #include "devmgr_service.h"
 #include "devsvc_manager_clnt.h"
 #include "hdf_device_object.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_pm.h"
 #include "osal_file.h"
 #include "osal_mem.h"
diff --git a/framework/test/unittest/model/audio/src/hdf_audio_test.c b/framework/test/unittest/model/audio/src/hdf_audio_test.c
index ff3630036aa781628cde24b52aaabaf96c6b6264..7dfac7187002dde44eabffca8cd74c70c3f41ee8 100644
--- a/framework/test/unittest/model/audio/src/hdf_audio_test.c
+++ b/framework/test/unittest/model/audio/src/hdf_audio_test.c
@@ -6,7 +6,7 @@
  * See the LICENSE file in the root of this repository for complete details.
  */
 
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "audio_host_test.h"
 #include "audio_core_test.h"
 #include "audio_parse_test.h"
diff --git a/framework/test/unittest/model/network/wifi/unittest/message/hdf_queue_test.c b/framework/test/unittest/model/network/wifi/unittest/message/hdf_queue_test.c
index 561e84e6a71791a71ef603be604a3c11ee5e2635..b6aa1f318243cc3e4006a86df59359703865a9d9 100644
--- a/framework/test/unittest/model/network/wifi/unittest/message/hdf_queue_test.c
+++ b/framework/test/unittest/model/network/wifi/unittest/message/hdf_queue_test.c
@@ -7,7 +7,7 @@
  */
 
 #include <securec.h>
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_message_test.h"
 #include "hdf_wlan_priority_queue.h"
 #include "osal_thread.h"
diff --git a/framework/test/unittest/model/network/wifi/unittest/message/hdf_single_node_message_test.c b/framework/test/unittest/model/network/wifi/unittest/message/hdf_single_node_message_test.c
index e32f581fbe682277ddbdb98553b05aec4201bb0d..6bec6a934ded05bc3d990b1b75e415868d5f1214 100644
--- a/framework/test/unittest/model/network/wifi/unittest/message/hdf_single_node_message_test.c
+++ b/framework/test/unittest/model/network/wifi/unittest/message/hdf_single_node_message_test.c
@@ -10,7 +10,7 @@
 #include "message/message_types.h"
 #include "message/message_router.h"
 #include "message/sidecar.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_sbuf.h"
 #include "osal_time.h"
 
diff --git a/framework/test/unittest/model/network/wifi/unittest/module/hdf_module_test.c b/framework/test/unittest/model/network/wifi/unittest/module/hdf_module_test.c
index cf4255f7e86cd3c8c348a6ad32b2932ccaa72ff0..6f432ef5afe64219ef93a2ee921279bd9d8b54f8 100644
--- a/framework/test/unittest/model/network/wifi/unittest/module/hdf_module_test.c
+++ b/framework/test/unittest/model/network/wifi/unittest/module/hdf_module_test.c
@@ -8,7 +8,7 @@
 
 #include "hdf_module_test.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_wifi_product.h"
 #include "ap.h"
 
diff --git a/framework/test/unittest/model/network/wifi/unittest/net/hdf_netbuf_test.c b/framework/test/unittest/model/network/wifi/unittest/net/hdf_netbuf_test.c
index 28c99dd0a0d68132a123fb78fadaf97bacd36d93..765a22c35d03ee66badb2224661a835bfea210b1 100644
--- a/framework/test/unittest/model/network/wifi/unittest/net/hdf_netbuf_test.c
+++ b/framework/test/unittest/model/network/wifi/unittest/net/hdf_netbuf_test.c
@@ -7,7 +7,7 @@
  */
 
 #include "hdf_netbuf.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_wifi_test.h"
 
 #define DEFAULT_NETBUF_SIZE     100
diff --git a/framework/test/unittest/model/network/wifi/unittest/netdevice/net_device_test.c b/framework/test/unittest/model/network/wifi/unittest/netdevice/net_device_test.c
index 4d41b00199bf0bf7dac005a29b8e7689e6b27d07..346d729ac55ff1df644dc88698b62977caae003b 100644
--- a/framework/test/unittest/model/network/wifi/unittest/netdevice/net_device_test.c
+++ b/framework/test/unittest/model/network/wifi/unittest/netdevice/net_device_test.c
@@ -7,7 +7,7 @@
  */
 
 #include "net_device_test.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "net_device.h"
 #include <securec.h>
 
diff --git a/framework/test/unittest/model/network/wifi/unittest/qos/flow_control_test.c b/framework/test/unittest/model/network/wifi/unittest/qos/flow_control_test.c
index 3b880ebf6de9acca7ab640841257d12a0ded1418..94972dd5c5d4e39dd5cdf1a293549782995d231b 100644
--- a/framework/test/unittest/model/network/wifi/unittest/qos/flow_control_test.c
+++ b/framework/test/unittest/model/network/wifi/unittest/qos/flow_control_test.c
@@ -8,7 +8,7 @@
 
 #include "flow_control_test.h"
 #include "flow_control.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "securec.h"
 #include "osal_time.h"
 
diff --git a/framework/test/unittest/model/usb/device/src/hdf_usb_device_test.c b/framework/test/unittest/model/usb/device/src/hdf_usb_device_test.c
index cd8ad1b1e5616114bcb2869489d0779f842d03e6..75928d4b80f8f65a6f0a31008d439ee7330dec73 100644
--- a/framework/test/unittest/model/usb/device/src/hdf_usb_device_test.c
+++ b/framework/test/unittest/model/usb/device/src/hdf_usb_device_test.c
@@ -7,7 +7,7 @@
  */
 #include "usb_device_lite_cdcacm_test.h"
 #include "hdf_module_test.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_message_test.h"
 #include "osal.h"
 #include "hdf_usb_device_test.h"
diff --git a/framework/test/unittest/model/usb/host/src/hdf_usb_entry_test.c b/framework/test/unittest/model/usb/host/src/hdf_usb_entry_test.c
index fb43d23ba151bb9db96023323f0c1ef1039ee8f3..03a439c8aa17bbffd4765eea55c26cb614ada0da 100644
--- a/framework/test/unittest/model/usb/host/src/hdf_usb_entry_test.c
+++ b/framework/test/unittest/model/usb/host/src/hdf_usb_entry_test.c
@@ -7,7 +7,7 @@
  */
 
 #include "hdf_usb_entry_test.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "usb_test.h"
 #include "usb_raw_test.h"
 
diff --git a/framework/test/unittest/model/usb/host/src/usb_raw_io.c b/framework/test/unittest/model/usb/host/src/usb_raw_io.c
index 348c5b4a8ecacfe8384b96c551e81bb30c4b0f64..89a957e7bef4d8c57ee83930598a62cea456b579 100644
--- a/framework/test/unittest/model/usb/host/src/usb_raw_io.c
+++ b/framework/test/unittest/model/usb/host/src/usb_raw_io.c
@@ -12,7 +12,7 @@
 #include "hdf_base.h"
 #include "hdf_device_desc.h"
 #include "hdf_dlist.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "osal_time.h"
 #include "usb_ddk_interface.h"
diff --git a/framework/test/unittest/model/usb/host/src/usb_raw_test.c b/framework/test/unittest/model/usb/host/src/usb_raw_test.c
index c5bca634dab2c85c5130fa343190293c9963684f..7dc25b662540a20e25c24939c86504df404fb35f 100644
--- a/framework/test/unittest/model/usb/host/src/usb_raw_test.c
+++ b/framework/test/unittest/model/usb/host/src/usb_raw_test.c
@@ -12,7 +12,7 @@
 #include "hdf_base.h"
 #include "hdf_device_desc.h"
 #include "hdf_dlist.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "osal_time.h"
 #include "usb_ddk_interface.h"
diff --git a/framework/test/unittest/model/usb/host/src/usb_test.c b/framework/test/unittest/model/usb/host/src/usb_test.c
index 90526ae3be449398a874c5c030fdeb461271e491..2d4d816788f46d2a859d8dc719a0ed618c46ad05 100644
--- a/framework/test/unittest/model/usb/host/src/usb_test.c
+++ b/framework/test/unittest/model/usb/host/src/usb_test.c
@@ -10,7 +10,7 @@
 #include "device_resource_if.h"
 #include "hdf_base.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "osal_time.h"
 #include "usb_ddk_interface.h"
diff --git a/framework/test/unittest/osal/osal_all_test.c b/framework/test/unittest/osal/osal_all_test.c
index 5b9c72d8e9cfd1252ca5a298fda2d80a8ea28b60..60ef1dff293be594a9deeae7464ef7060720d34a 100644
--- a/framework/test/unittest/osal/osal_all_test.c
+++ b/framework/test/unittest/osal/osal_all_test.c
@@ -11,7 +11,7 @@
 #endif
 
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_case_cmd_test.h"
 #include "osal_file_test.h"
 #include "osal_firmware.h"
diff --git a/framework/test/unittest/osal/osal_file_test.c b/framework/test/unittest/osal/osal_file_test.c
index c52254b0ce3408f47844d8cfada5a39b3b79076c..e0fccdf2cccb41eafb82b6ebfd4d93a3d209c486 100644
--- a/framework/test/unittest/osal/osal_file_test.c
+++ b/framework/test/unittest/osal/osal_file_test.c
@@ -6,7 +6,7 @@
  * See the LICENSE file in the root of this repository for complete details.
  */
 
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_file.h"
 #include "osal_test_case_def.h"
 #include "osal_test_type.h"
diff --git a/framework/test/unittest/osal/osal_list_test.c b/framework/test/unittest/osal/osal_list_test.c
index a0f7073fdca84f884c2c04b7fcaa8e99799b2413..6d919ea886f4e8a8f23d1e3c9ca2bdb893caa9db 100644
--- a/framework/test/unittest/osal/osal_list_test.c
+++ b/framework/test/unittest/osal/osal_list_test.c
@@ -8,7 +8,7 @@
 
 #include "securec.h"
 #include "hdf_dlist.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_case_cmd_test.h"
 #include "osal_work_test.h"
 #include "osal_sem.h"
diff --git a/framework/test/unittest/osal/osal_test_entry.c b/framework/test/unittest/osal/osal_test_entry.c
index f9b150eb8777df635f335e4a52ab816db2ff8cea..3c327c6c6d8ac17a9fbf4079f2be8e0dc8761d8f 100644
--- a/framework/test/unittest/osal/osal_test_entry.c
+++ b/framework/test/unittest/osal/osal_test_entry.c
@@ -8,7 +8,7 @@
 
 #include "osal_test_entry.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_case_cmd_test.h"
 #include "osal_get_case_test.h"
 
diff --git a/framework/test/unittest/osal/osal_work_test.c b/framework/test/unittest/osal/osal_work_test.c
index ebbdc12573fe992eeb3b43230e2fbaaee804d68f..c961c64290ceeaf87bc28cb53318236350ccf1a1 100644
--- a/framework/test/unittest/osal/osal_work_test.c
+++ b/framework/test/unittest/osal/osal_work_test.c
@@ -7,7 +7,7 @@
  */
 
 #include "securec.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_workqueue.h"
 #include "osal_atomic.h"
 #include "osal_file.h"
diff --git a/framework/test/unittest/platform/common/adc_driver_test.c b/framework/test/unittest/platform/common/adc_driver_test.c
index e14dc7b305537d0d5791a1e8385bfe801ad77bd7..024cffe1566752c347b0a22a051fec77a0a4be6e 100644
--- a/framework/test/unittest/platform/common/adc_driver_test.c
+++ b/framework/test/unittest/platform/common/adc_driver_test.c
@@ -10,7 +10,7 @@
 #include "device_resource_if.h"
 #include "hdf_base.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG adc_test_driver_c
 
diff --git a/framework/test/unittest/platform/common/adc_test.c b/framework/test/unittest/platform/common/adc_test.c
index 188befc18aa81362299985b47f5465382aa4b1cb..33844b646f6328d98d740b486a8a8f1cd7bb7a0f 100644
--- a/framework/test/unittest/platform/common/adc_test.c
+++ b/framework/test/unittest/platform/common/adc_test.c
@@ -10,7 +10,7 @@
 #include "adc_if.h"
 #include "hdf_base.h"
 #include "hdf_io_service_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "securec.h"
 #include "osal_thread.h"
diff --git a/framework/test/unittest/platform/common/can_test.c b/framework/test/unittest/platform/common/can_test.c
index dbba19d19d443b771de0591d7ad344ed32ee9b63..c2ed9f2851f55cbfacda22a6a75932c1ea4c4d3a 100644
--- a/framework/test/unittest/platform/common/can_test.c
+++ b/framework/test/unittest/platform/common/can_test.c
@@ -11,7 +11,7 @@
 #include "device_resource_if.h"
 #include "hdf_device_desc.h"
 #include "hdf_io_service_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "osal_thread.h"
 #include "osal_time.h"
diff --git a/framework/test/unittest/platform/common/clock_driver_test.c b/framework/test/unittest/platform/common/clock_driver_test.c
index ad58a6835a6057696802936d40cdb5052f40345b..f1714a435120a249288489180ef9e40b95ccdf88 100644
--- a/framework/test/unittest/platform/common/clock_driver_test.c
+++ b/framework/test/unittest/platform/common/clock_driver_test.c
@@ -10,7 +10,7 @@
 #include "device_resource_if.h"
 #include "hdf_base.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG clock_test_driver_c
 
diff --git a/framework/test/unittest/platform/common/clock_test.c b/framework/test/unittest/platform/common/clock_test.c
index 74e9c8d0e28a544b81da2dcaa2014e8a97293589..8ea4b16e9ca73ac962368c65dfcbd7b0dfc5a698 100644
--- a/framework/test/unittest/platform/common/clock_test.c
+++ b/framework/test/unittest/platform/common/clock_test.c
@@ -10,7 +10,7 @@
 #include "clock_if.h"
 #include "hdf_base.h"
 #include "hdf_io_service_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "securec.h"
 #include "osal_thread.h"
diff --git a/framework/test/unittest/platform/common/dac_driver_test.c b/framework/test/unittest/platform/common/dac_driver_test.c
index 390539126bbb7ad321d6bdcf086465b5d76432a1..dafd19e58afc0b5e75d6871b3ddfec51df46df36 100644
--- a/framework/test/unittest/platform/common/dac_driver_test.c
+++ b/framework/test/unittest/platform/common/dac_driver_test.c
@@ -10,7 +10,7 @@
 #include "device_resource_if.h"
 #include "hdf_base.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG dac_test_driver_c
 
diff --git a/framework/test/unittest/platform/common/dac_test.c b/framework/test/unittest/platform/common/dac_test.c
index 56eba4aaf9d0b64fd98eedf4aaf2a39563e97f53..a205236ff2bc0b9483b1fabaf2d62f42582a0aec 100644
--- a/framework/test/unittest/platform/common/dac_test.c
+++ b/framework/test/unittest/platform/common/dac_test.c
@@ -8,7 +8,7 @@
 
 #include "dac_test.h"
 #include "hdf_io_service_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_thread.h"
 #include "osal_time.h"
 #include "securec.h"
diff --git a/framework/test/unittest/platform/common/emmc_test.c b/framework/test/unittest/platform/common/emmc_test.c
index 3b2d57df1fa8e37bc3f8508b878ca77123618bbd..a11cf40da6702f489c0c896c715a2dd474615186 100644
--- a/framework/test/unittest/platform/common/emmc_test.c
+++ b/framework/test/unittest/platform/common/emmc_test.c
@@ -8,7 +8,7 @@
 
 #include "device_resource_if.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "osal_time.h"
 #include "emmc_if.h"
diff --git a/framework/test/unittest/platform/common/gpio_driver_test.c b/framework/test/unittest/platform/common/gpio_driver_test.c
index 3c1db46bb4d435ff52f0690f72d6415265b0d680..1930a60128fce96a597767c341d1316ac6a5704e 100644
--- a/framework/test/unittest/platform/common/gpio_driver_test.c
+++ b/framework/test/unittest/platform/common/gpio_driver_test.c
@@ -10,7 +10,7 @@
 #include "device_resource_if.h"
 #include "hdf_base.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "securec.h"
 
 static struct GpioTestConfig g_config;
diff --git a/framework/test/unittest/platform/common/gpio_test.c b/framework/test/unittest/platform/common/gpio_test.c
index 34798ba7e5f2b16f8ba95c8d7cb5bfb752bc3554..7686d04467718bd7ab7716ee95101c41f82cc575 100644
--- a/framework/test/unittest/platform/common/gpio_test.c
+++ b/framework/test/unittest/platform/common/gpio_test.c
@@ -10,7 +10,7 @@
 #include "gpio_if.h"
 #include "hdf_base.h"
 #include "hdf_io_service_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_irq.h"
 #include "osal_time.h"
 #include "securec.h"
diff --git a/framework/test/unittest/platform/common/hdmi_test.c b/framework/test/unittest/platform/common/hdmi_test.c
index 86bbae784ef751f247491654207d4a369e7ee0e9..f6ad3102cc848fab99d0c6684e02bac10cfcd107 100644
--- a/framework/test/unittest/platform/common/hdmi_test.c
+++ b/framework/test/unittest/platform/common/hdmi_test.c
@@ -9,7 +9,7 @@
 #include "hdmi_test.h"
 #include "device_resource_if.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdmi_if.h"
 #include "osal_time.h"
 
diff --git a/framework/test/unittest/platform/common/i2c_driver_test.c b/framework/test/unittest/platform/common/i2c_driver_test.c
index 915af7b35abdb2e75283f00cfb0a70a27f8b7505..782cea89b2411ce8e785c08a30b43a3d463790ae 100644
--- a/framework/test/unittest/platform/common/i2c_driver_test.c
+++ b/framework/test/unittest/platform/common/i2c_driver_test.c
@@ -10,7 +10,7 @@
 #include "device_resource_if.h"
 #include "hdf_base.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 static struct I2cTestConfig g_config;
 
diff --git a/framework/test/unittest/platform/common/i2c_test.c b/framework/test/unittest/platform/common/i2c_test.c
index 7d7ee1e5577b784d79b0b8c1e017f864f5824cff..7d3b963f87e78bff117e43ee4b7b9bd1a9d85080 100644
--- a/framework/test/unittest/platform/common/i2c_test.c
+++ b/framework/test/unittest/platform/common/i2c_test.c
@@ -9,7 +9,7 @@
 #include "i2c_test.h"
 #include "hdf_base.h"
 #include "hdf_io_service_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "i2c_if.h"
 #include "osal_mem.h"
 #include "osal_thread.h"
diff --git a/framework/test/unittest/platform/common/i2s_test.c b/framework/test/unittest/platform/common/i2s_test.c
index 71729d8af9c38b3263e2609bd0f565d39d7e91f6..95a07fe1d9a835955ea1fee57a97a0ae479caa7b 100644
--- a/framework/test/unittest/platform/common/i2s_test.c
+++ b/framework/test/unittest/platform/common/i2s_test.c
@@ -10,7 +10,7 @@
 #include <unistd.h>
 #include "device_resource_if.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "i2s_if.h"
 #include "osal_file.h"
 #include "osal_mem.h"
diff --git a/framework/test/unittest/platform/common/i3c_driver_test.c b/framework/test/unittest/platform/common/i3c_driver_test.c
index 7519f730db53aef3b68f4a63edc78e71ffea6d29..d6a0950c64b9ca703eb44672dd15158e5ad9913d 100644
--- a/framework/test/unittest/platform/common/i3c_driver_test.c
+++ b/framework/test/unittest/platform/common/i3c_driver_test.c
@@ -10,7 +10,7 @@
 #include "device_resource_if.h"
 #include "hdf_base.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG i3c_driver_test_c
 
diff --git a/framework/test/unittest/platform/common/i3c_test.c b/framework/test/unittest/platform/common/i3c_test.c
index 6a5a0246cb99eaeee95d02a8bdfe4717c143361e..ca6173a3bea39a80937a129f3547ad9b08a22f2e 100644
--- a/framework/test/unittest/platform/common/i3c_test.c
+++ b/framework/test/unittest/platform/common/i3c_test.c
@@ -9,7 +9,7 @@
 #include "i3c_test.h"
 #include "hdf_base.h"
 #include "hdf_io_service_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "i3c_if.h"
 #include "osal_mem.h"
 #include "osal_thread.h"
diff --git a/framework/test/unittest/platform/common/mipi_csi_test.c b/framework/test/unittest/platform/common/mipi_csi_test.c
index debeed6f0365a336f46834366eef4ae4dfff1144..0bef05f93b48d08dc1ba68e2c7bfcea43e062e2c 100644
--- a/framework/test/unittest/platform/common/mipi_csi_test.c
+++ b/framework/test/unittest/platform/common/mipi_csi_test.c
@@ -7,7 +7,7 @@
  */
 
 #include "mipi_csi_test.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_time.h"
 #include "securec.h"
 
diff --git a/framework/test/unittest/platform/common/mipi_dsi_test.c b/framework/test/unittest/platform/common/mipi_dsi_test.c
index 6f50abbffae395536c32740b84b1dded124d4310..03540cc377ae2fad73c126d229077d4c50334b8a 100644
--- a/framework/test/unittest/platform/common/mipi_dsi_test.c
+++ b/framework/test/unittest/platform/common/mipi_dsi_test.c
@@ -7,7 +7,7 @@
  */
 
 #include "mipi_dsi_test.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG mipi_dsi_test
 
diff --git a/framework/test/unittest/platform/common/pcie_bus_driver_test.c b/framework/test/unittest/platform/common/pcie_bus_driver_test.c
index 5c08a8816b658984447030e209ed016d73dfc166..cbd978771c18efd2ad4a1a7e20c3f5ac2cc018d3 100644
--- a/framework/test/unittest/platform/common/pcie_bus_driver_test.c
+++ b/framework/test/unittest/platform/common/pcie_bus_driver_test.c
@@ -10,7 +10,7 @@
 #include "hdf_base.h"
 #include "hdf_device_desc.h"
 #include "hdf_ibus_intf.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "pcie_bus_test.h"
 
 static struct PcieBusTestConfig g_config;
diff --git a/framework/test/unittest/platform/common/pcie_bus_test.c b/framework/test/unittest/platform/common/pcie_bus_test.c
index 8c293164f126aa0a6ff60b14d03fa23df769d2a9..ce7ea033e86efc4e65a03aa54c1c123560f7997f 100644
--- a/framework/test/unittest/platform/common/pcie_bus_test.c
+++ b/framework/test/unittest/platform/common/pcie_bus_test.c
@@ -10,7 +10,7 @@
 #include <securec.h>
 #include "hdf_base.h"
 #include "hdf_io_service_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "pcie_if.h"
 #define USER_LEM_MAX           8192
diff --git a/framework/test/unittest/platform/common/pcie_driver_test.c b/framework/test/unittest/platform/common/pcie_driver_test.c
index 091382d2b8005d6bf6fa07fe1f9fd39bc0a50033..039b1747bfe67d60509cad2fe94105a7c0d2425a 100644
--- a/framework/test/unittest/platform/common/pcie_driver_test.c
+++ b/framework/test/unittest/platform/common/pcie_driver_test.c
@@ -10,7 +10,7 @@
 #include "device_resource_if.h"
 #include "hdf_base.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG pcie_test_driver_c
 
diff --git a/framework/test/unittest/platform/common/pcie_test.c b/framework/test/unittest/platform/common/pcie_test.c
index 594af15a5565211ad386eb9d4970cd53b2e203fb..7eadfd222f6430522749a3017e04232678b96e34 100644
--- a/framework/test/unittest/platform/common/pcie_test.c
+++ b/framework/test/unittest/platform/common/pcie_test.c
@@ -10,7 +10,7 @@
 #include "device_resource_if.h"
 #include "hdf_base.h"
 #include "hdf_io_service_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "osal_time.h"
 
diff --git a/framework/test/unittest/platform/common/pin_driver_test.c b/framework/test/unittest/platform/common/pin_driver_test.c
index e3da2815ba0ce58a6d9022c3ce10ed9a4e498192..834d0c042ef7d20624de6ceb1d850ecad90279ec 100644
--- a/framework/test/unittest/platform/common/pin_driver_test.c
+++ b/framework/test/unittest/platform/common/pin_driver_test.c
@@ -9,7 +9,7 @@
 #include "device_resource_if.h"
 #include "hdf_base.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "pin_test.h"
 #include "securec.h"
 #include "string.h"
diff --git a/framework/test/unittest/platform/common/pin_test.c b/framework/test/unittest/platform/common/pin_test.c
index 950393ee51cabf0e4d1974a37e76b5d20dd1a3e5..1cb89f3104cb382b285d1010f5fc58dd2fc228f8 100644
--- a/framework/test/unittest/platform/common/pin_test.c
+++ b/framework/test/unittest/platform/common/pin_test.c
@@ -9,7 +9,7 @@
 #include "pin_test.h"
 #include "hdf_base.h"
 #include "hdf_io_service_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "osal_time.h"
 #include "pin_if.h"
diff --git a/framework/test/unittest/platform/common/platform_event_test.c b/framework/test/unittest/platform/common/platform_event_test.c
index bdb0194f7ff7f17d9bece48275e03c525e69bc8e..18f28b4b2e77f5e8299c21521caaae6489a300c9 100644
--- a/framework/test/unittest/platform/common/platform_event_test.c
+++ b/framework/test/unittest/platform/common/platform_event_test.c
@@ -8,7 +8,7 @@
 
 #include "platform_event_test.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_sem.h"
 #include "osal_spinlock.h"
 #include "osal_time.h"
diff --git a/framework/test/unittest/platform/common/platform_trace_test.c b/framework/test/unittest/platform/common/platform_trace_test.c
index 1b01a1e7adaead7d549438f73ce697c0b86e1333..f7b6a5906aef2d828328933170049b9c53cdf09c 100644
--- a/framework/test/unittest/platform/common/platform_trace_test.c
+++ b/framework/test/unittest/platform/common/platform_trace_test.c
@@ -7,7 +7,7 @@
  */
 
 #include "platform_trace_test.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "platform_trace.h"
 
 #define HDF_LOG_TAG platform_trace_test
diff --git a/framework/test/unittest/platform/common/pwm_driver_test.c b/framework/test/unittest/platform/common/pwm_driver_test.c
index 3978c59786c255b39a64d2f4a1d46cca91d095b9..13df0bb30279405088c6afe47e1d19fcafe98585 100644
--- a/framework/test/unittest/platform/common/pwm_driver_test.c
+++ b/framework/test/unittest/platform/common/pwm_driver_test.c
@@ -10,7 +10,7 @@
 #include "device_resource_if.h"
 #include "hdf_base.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG pwm_driver_test_c
 
diff --git a/framework/test/unittest/platform/common/pwm_test.c b/framework/test/unittest/platform/common/pwm_test.c
index aa064e426b9b98e85ec8369068fe5290c099557f..fa31414eb36182d12d8a04fead8fb0d3f9f87273 100644
--- a/framework/test/unittest/platform/common/pwm_test.c
+++ b/framework/test/unittest/platform/common/pwm_test.c
@@ -9,7 +9,7 @@
 #include "pwm_test.h"
 #include "device_resource_if.h"
 #include "hdf_io_service_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "osal_time.h"
 #include "securec.h"
diff --git a/framework/test/unittest/platform/common/regulator_test.c b/framework/test/unittest/platform/common/regulator_test.c
index e31427978254f800037426d7665123c618457bfa..3733b3bb25fb3112577c170cb1a6d78cda418cc2 100644
--- a/framework/test/unittest/platform/common/regulator_test.c
+++ b/framework/test/unittest/platform/common/regulator_test.c
@@ -8,7 +8,7 @@
 
 #include "regulator_test.h"
 #include "device_resource_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_thread.h"
 #include "osal_time.h"
 #include "securec.h"
diff --git a/framework/test/unittest/platform/common/rtc_driver_test.c b/framework/test/unittest/platform/common/rtc_driver_test.c
index 5f79db62ade1fe551b50aec85e4c19f75ea35859..2edb4ee417e587a4fcd8eba44f2e7b6484696991 100644
--- a/framework/test/unittest/platform/common/rtc_driver_test.c
+++ b/framework/test/unittest/platform/common/rtc_driver_test.c
@@ -10,7 +10,7 @@
 #include "device_resource_if.h"
 #include "hdf_base.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_time.h"
 #include "rtc_base.h"
 #include "rtc_if.h"
diff --git a/framework/test/unittest/platform/common/rtc_test.c b/framework/test/unittest/platform/common/rtc_test.c
index 9c89c0f3e6af17ae717e1bf3fd44ed1562ee8168..b650f370efe552aabc6a61a1958cfdf113d3694f 100644
--- a/framework/test/unittest/platform/common/rtc_test.c
+++ b/framework/test/unittest/platform/common/rtc_test.c
@@ -9,7 +9,7 @@
 #include "rtc_test.h"
 #include "hdf_base.h"
 #include "hdf_io_service_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "osal_time.h"
 #include "rtc_base.h"
diff --git a/framework/test/unittest/platform/common/sdio_test.c b/framework/test/unittest/platform/common/sdio_test.c
index 250bbaeda2469544ab18a683b080541acacc56f2..56da1405f18564677df195a36416ad56b2cf3c03 100644
--- a/framework/test/unittest/platform/common/sdio_test.c
+++ b/framework/test/unittest/platform/common/sdio_test.c
@@ -8,7 +8,7 @@
 
 #include "device_resource_if.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "osal_time.h"
 #include "sdio_if.h"
diff --git a/framework/test/unittest/platform/common/spi_driver_test.c b/framework/test/unittest/platform/common/spi_driver_test.c
index bef6fd020deca234789b5831986b6398fd245c7a..4df3e6292eecdefc5548b17b91c0251be637291f 100644
--- a/framework/test/unittest/platform/common/spi_driver_test.c
+++ b/framework/test/unittest/platform/common/spi_driver_test.c
@@ -11,7 +11,7 @@
 #include "device_resource_if.h"
 #include "osal_mem.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "spi_test.h"
 
 #define HDF_LOG_TAG spi_test_driver_c
diff --git a/framework/test/unittest/platform/common/spi_test.c b/framework/test/unittest/platform/common/spi_test.c
index 5049f5e67086dc8bec93040e3820f5a063d8e0c8..590820ad1970f717990a3f0d22246bd40e20fb57 100644
--- a/framework/test/unittest/platform/common/spi_test.c
+++ b/framework/test/unittest/platform/common/spi_test.c
@@ -11,7 +11,7 @@
 #include "device_resource_if.h"
 #include "hdf_io_service_if.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "osal_time.h"
 #include "spi_if.h"
diff --git a/framework/test/unittest/platform/common/timer_driver_test.c b/framework/test/unittest/platform/common/timer_driver_test.c
index c56719b5805957c8b8046c571edd73abf2a3f5a0..5a591ff57efe152fe66773aa19058fb6c50363a9 100644
--- a/framework/test/unittest/platform/common/timer_driver_test.c
+++ b/framework/test/unittest/platform/common/timer_driver_test.c
@@ -10,7 +10,7 @@
 #include "device_resource_if.h"
 #include "hdf_base.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG timer_driver_test_c
 
@@ -40,36 +40,36 @@ static int32_t TimerTestDispatch(struct HdfDeviceIoClient *client, int cmd, stru
 static int32_t TimerTestReadConfig(struct TimerTestConfig *config, const struct DeviceResourceNode *node)
 {
     int32_t ret;
-    struct DeviceResourceIface *face = NULL;
-
-    face = DeviceResourceGetIfaceInstance(HDF_CONFIG_SOURCE);
-    if (face == NULL) {
-        HDF_LOGE("TimerTestReadConfig: face is null!");
-        return HDF_FAILURE;
-    }
-    if (face->GetUint32 == NULL) {
-        HDF_LOGE("TimerTestReadConfig: GetUint32 not support!");
-        return HDF_ERR_NOT_SUPPORT;
-    }
-
+    struct DeviceResourceIface *face = NULL;
+
+    face = DeviceResourceGetIfaceInstance(HDF_CONFIG_SOURCE);
+    if (face == NULL) {
+        HDF_LOGE("TimerTestReadConfig: face is null!");
+        return HDF_FAILURE;
+    }
+    if (face->GetUint32 == NULL) {
+        HDF_LOGE("TimerTestReadConfig: GetUint32 not support!");
+        return HDF_ERR_NOT_SUPPORT;
+    }
+
     ret = face->GetUint32(node, "number", &config->number, 0);
-    if (ret != HDF_SUCCESS) {
-        HDF_LOGE("TimerTestReadConfig: read id fail, ret: %d!", ret);
-        return ret;
-    }
-
+    if (ret != HDF_SUCCESS) {
+        HDF_LOGE("TimerTestReadConfig: read id fail, ret: %d!", ret);
+        return ret;
+    }
+
     ret = face->GetUint32(node, "useconds", &config->uSecond, 0);
-    if (ret != HDF_SUCCESS) {
-        HDF_LOGE("TimerTestReadConfig: read useconds fail, ret: %d!", ret);
-        return ret;
-    }
-
+    if (ret != HDF_SUCCESS) {
+        HDF_LOGE("TimerTestReadConfig: read useconds fail, ret: %d!", ret);
+        return ret;
+    }
+
     ret = face->GetUint32(node, "isPeriod", &config->isPeriod, 0);
-    if (ret != HDF_SUCCESS) {
-        HDF_LOGE("TimerTestReadConfig: read isPeriod fail, ret: %d!", ret);
-        return ret;
-    }
-
+    if (ret != HDF_SUCCESS) {
+        HDF_LOGE("TimerTestReadConfig: read isPeriod fail, ret: %d!", ret);
+        return ret;
+    }
+
     HDF_LOGD("timer test init:number[%u][%u][%d]", config->number, config->uSecond, config->isPeriod);
 
     return HDF_SUCCESS;
diff --git a/framework/test/unittest/platform/common/timer_test.c b/framework/test/unittest/platform/common/timer_test.c
index 3383664711708a8dc086fdf799a2f4e27ed2952d..b866df01bf3422f467e3b3ceac8fba6904730f12 100644
--- a/framework/test/unittest/platform/common/timer_test.c
+++ b/framework/test/unittest/platform/common/timer_test.c
@@ -9,7 +9,7 @@
 #include "timer_test.h"
 #include "device_resource_if.h"
 #include "hdf_io_service_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "osal_thread.h"
 #include "osal_time.h"
diff --git a/framework/test/unittest/platform/common/uart_driver_test.c b/framework/test/unittest/platform/common/uart_driver_test.c
index a92d9248dd004e503a69739efecf4f1a88c4aef6..8bd4948395012fc48b11415065d1eb2c7394d3d6 100644
--- a/framework/test/unittest/platform/common/uart_driver_test.c
+++ b/framework/test/unittest/platform/common/uart_driver_test.c
@@ -10,7 +10,7 @@
 #include "device_resource_if.h"
 #include "hdf_base.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 
 static struct UartTestConfig g_config;
diff --git a/framework/test/unittest/platform/common/uart_test.c b/framework/test/unittest/platform/common/uart_test.c
index f464673f52d09c3f3e1d44592925ae86d5024790..0633ae591358907cf1dbd612fe971bf6d642a67c 100644
--- a/framework/test/unittest/platform/common/uart_test.c
+++ b/framework/test/unittest/platform/common/uart_test.c
@@ -9,7 +9,7 @@
 #include "uart_test.h"
 #include "hdf_base.h"
 #include "hdf_io_service_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "osal_time.h"
 #include "securec.h"
diff --git a/framework/test/unittest/platform/common/watchdog_driver_test.c b/framework/test/unittest/platform/common/watchdog_driver_test.c
index 05ebf99393df5b077032a4d3fbe4d09c24d6e02f..07a792776a9b69cc5c62e434085bd04873b9cfee 100644
--- a/framework/test/unittest/platform/common/watchdog_driver_test.c
+++ b/framework/test/unittest/platform/common/watchdog_driver_test.c
@@ -10,7 +10,7 @@
 #include "device_resource_if.h"
 #include "hdf_base.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG watchdog_driver_test_c
 
diff --git a/framework/test/unittest/platform/common/watchdog_test.c b/framework/test/unittest/platform/common/watchdog_test.c
index ae7142ef29fed173ab34abc318486556db559ba7..ef85c3d085219f5b1dc7dd2977c6a5a5c2ae2224 100644
--- a/framework/test/unittest/platform/common/watchdog_test.c
+++ b/framework/test/unittest/platform/common/watchdog_test.c
@@ -9,7 +9,7 @@
 #include "watchdog_test.h"
 #include "hdf_base.h"
 #include "hdf_io_service_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "osal_time.h"
 #include "securec.h"
diff --git a/framework/test/unittest/platform/config/can_test_config.c b/framework/test/unittest/platform/config/can_test_config.c
index f42bc80010ae9b0f290b53a358a7218cb18aad5e..7721e452b279bc36801c07e6017736a49f2b0663 100644
--- a/framework/test/unittest/platform/config/can_test_config.c
+++ b/framework/test/unittest/platform/config/can_test_config.c
@@ -10,7 +10,7 @@
 #include "device_resource_if.h"
 #include "hdf_base.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 static struct CanTestConfig g_config;
 
diff --git a/framework/test/unittest/platform/entry/hdf_adc_entry_test.c b/framework/test/unittest/platform/entry/hdf_adc_entry_test.c
index cfb846ac56220f55affc1dfc4dd7cb2a18ef6e30..d81dbcc67e56990c8cbfd21e369264de9f2a75dd 100644
--- a/framework/test/unittest/platform/entry/hdf_adc_entry_test.c
+++ b/framework/test/unittest/platform/entry/hdf_adc_entry_test.c
@@ -8,7 +8,7 @@
 
 #include "hdf_adc_entry_test.h"
 #include "adc_test.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG hdf_adc_entry_test
 
diff --git a/framework/test/unittest/platform/entry/hdf_clock_entry_test.c b/framework/test/unittest/platform/entry/hdf_clock_entry_test.c
index 5902e8b0a1a5cc638071044081233b423a3e6c08..8c7007581260742f6f38bdfac0340279392d1c83 100644
--- a/framework/test/unittest/platform/entry/hdf_clock_entry_test.c
+++ b/framework/test/unittest/platform/entry/hdf_clock_entry_test.c
@@ -8,7 +8,7 @@
 
 #include "hdf_clock_entry_test.h"
 #include "clock_test.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG hdf_clock_entry_test
 
diff --git a/framework/test/unittest/platform/entry/hdf_dac_entry_test.c b/framework/test/unittest/platform/entry/hdf_dac_entry_test.c
index 83e61ef0839be5ada2b251a5ffda2251838d8d26..172af41a45f08da91796d3db1d8749253ce06030 100644
--- a/framework/test/unittest/platform/entry/hdf_dac_entry_test.c
+++ b/framework/test/unittest/platform/entry/hdf_dac_entry_test.c
@@ -8,7 +8,7 @@
 
 #include "hdf_dac_entry_test.h"
 #include "dac_test.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG hdf_dac_entry_test
 
diff --git a/framework/test/unittest/platform/entry/hdf_emmc_entry_test.c b/framework/test/unittest/platform/entry/hdf_emmc_entry_test.c
index acfb8b6e03ea1ecef19c39b55d743a7f6101ec68..b9902b28b3f29a8f098ee5b6088d7ac384e11bb8 100644
--- a/framework/test/unittest/platform/entry/hdf_emmc_entry_test.c
+++ b/framework/test/unittest/platform/entry/hdf_emmc_entry_test.c
@@ -8,7 +8,7 @@
 
 #include "hdf_emmc_entry_test.h"
 #include "emmc_test.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG hdf_emmc_entry_test
 
diff --git a/framework/test/unittest/platform/entry/hdf_gpio_entry_test.c b/framework/test/unittest/platform/entry/hdf_gpio_entry_test.c
index 688ffc905f99996e26133ac0317d8e82bcc7defc..175b5cc66c373e1d1ecb29e03c3ba285e52a4cef 100644
--- a/framework/test/unittest/platform/entry/hdf_gpio_entry_test.c
+++ b/framework/test/unittest/platform/entry/hdf_gpio_entry_test.c
@@ -8,7 +8,7 @@
 
 #include "hdf_gpio_entry_test.h"
 #include "gpio_test.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG hdf_gpio_entry_test
 
diff --git a/framework/test/unittest/platform/entry/hdf_hdmi_entry_test.c b/framework/test/unittest/platform/entry/hdf_hdmi_entry_test.c
index cff28098929bbafc1e47ff58620333c9db651538..a74234ccc96592ec9ee040e9efac554a122d6e2b 100644
--- a/framework/test/unittest/platform/entry/hdf_hdmi_entry_test.c
+++ b/framework/test/unittest/platform/entry/hdf_hdmi_entry_test.c
@@ -7,7 +7,7 @@
  */
 
 #include "hdf_hdmi_entry_test.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdmi_if.h"
 #include "hdmi_test.h"
 
diff --git a/framework/test/unittest/platform/entry/hdf_i2c_entry_test.c b/framework/test/unittest/platform/entry/hdf_i2c_entry_test.c
index 769968437bf54b77e8d56c258dd3dee026550506..e2a71525b12fc5572777f1a8819dd850603b95df 100644
--- a/framework/test/unittest/platform/entry/hdf_i2c_entry_test.c
+++ b/framework/test/unittest/platform/entry/hdf_i2c_entry_test.c
@@ -7,7 +7,7 @@
  */
 
 #include "hdf_i2c_entry_test.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "i2c_test.h"
 
 #define HDF_LOG_TAG hdf_i2c_entry_test
diff --git a/framework/test/unittest/platform/entry/hdf_i2s_entry_test.c b/framework/test/unittest/platform/entry/hdf_i2s_entry_test.c
index 4c0694d971e2dc3b89e42cd0bf7ad0870cc24385..bb793af9ed685eff512780215f117a21e345c2aa 100644
--- a/framework/test/unittest/platform/entry/hdf_i2s_entry_test.c
+++ b/framework/test/unittest/platform/entry/hdf_i2s_entry_test.c
@@ -7,7 +7,7 @@
  */
 
 #include "hdf_i2s_entry_test.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "i2s_test.h"
 
 #define HDF_LOG_TAG hdf_i2s_entry_test
diff --git a/framework/test/unittest/platform/entry/hdf_i3c_entry_test.c b/framework/test/unittest/platform/entry/hdf_i3c_entry_test.c
index 57c6ecfd62272980f8e17b95bc44493feb20004a..72568fd484bdee498086424776b00ae8c9e015c1 100644
--- a/framework/test/unittest/platform/entry/hdf_i3c_entry_test.c
+++ b/framework/test/unittest/platform/entry/hdf_i3c_entry_test.c
@@ -7,7 +7,7 @@
  */
 
 #include "hdf_i3c_entry_test.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "i3c_test.h"
 
 #define HDF_LOG_TAG hdf_adc_entry_test
diff --git a/framework/test/unittest/platform/entry/hdf_mipi_csi_entry_test.c b/framework/test/unittest/platform/entry/hdf_mipi_csi_entry_test.c
index 4b86ed8cb4b51824b9cacbb452c9fb3189936d3e..44619a63a4ef2953035ca0a85b3b300ec76d5459 100644
--- a/framework/test/unittest/platform/entry/hdf_mipi_csi_entry_test.c
+++ b/framework/test/unittest/platform/entry/hdf_mipi_csi_entry_test.c
@@ -7,7 +7,7 @@
  */
 
 #include "hdf_mipi_csi_entry_test.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "mipi_csi_test.h"
 
 #define HDF_LOG_TAG hdf_mipi_csi_entry_test
diff --git a/framework/test/unittest/platform/entry/hdf_mipi_dsi_entry_test.c b/framework/test/unittest/platform/entry/hdf_mipi_dsi_entry_test.c
index 65bef10371e6a66a2b07db3332bb160473b02c45..3645a5123b9647cfc6513523613918e59738e2c5 100644
--- a/framework/test/unittest/platform/entry/hdf_mipi_dsi_entry_test.c
+++ b/framework/test/unittest/platform/entry/hdf_mipi_dsi_entry_test.c
@@ -7,7 +7,7 @@
  */
 
 #include "hdf_mipi_dsi_entry_test.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "mipi_dsi_test.h"
 
 #define HDF_LOG_TAG hdf_mipi_dsi_entry_test
diff --git a/framework/test/unittest/platform/entry/hdf_pcie_bus_entry_test.c b/framework/test/unittest/platform/entry/hdf_pcie_bus_entry_test.c
index 2fc5149cebe3d3be617721cb2eac1700c23c71e2..238cca92a7cde485f7b12954f7a8c5f8d4f06d5c 100644
--- a/framework/test/unittest/platform/entry/hdf_pcie_bus_entry_test.c
+++ b/framework/test/unittest/platform/entry/hdf_pcie_bus_entry_test.c
@@ -6,7 +6,7 @@
  * See the LICENSE file in the root of this repository for complete details.
  */
 
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_pcie_entry_test.h"
 #include "pcie_bus_test.h"
 
diff --git a/framework/test/unittest/platform/entry/hdf_pcie_entry_test.c b/framework/test/unittest/platform/entry/hdf_pcie_entry_test.c
index 2bc4c17883a11b443bd59c3776c1d21d18b5d119..b6fc7d94ff824e17d5f7929cba2aa96dd88b94cf 100644
--- a/framework/test/unittest/platform/entry/hdf_pcie_entry_test.c
+++ b/framework/test/unittest/platform/entry/hdf_pcie_entry_test.c
@@ -7,7 +7,7 @@
  */
 
 #include "hdf_pcie_entry_test.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "pcie_test.h"
 
 #define HDF_LOG_TAG hdf_pcie_entry_test
diff --git a/framework/test/unittest/platform/entry/hdf_pin_entry_test.c b/framework/test/unittest/platform/entry/hdf_pin_entry_test.c
index a6bbe3f3ec6e7e26f35e52266b3518b6620fd16c..d913ba85b52e7ad328f4f59273c230ca28337de5 100644
--- a/framework/test/unittest/platform/entry/hdf_pin_entry_test.c
+++ b/framework/test/unittest/platform/entry/hdf_pin_entry_test.c
@@ -7,7 +7,7 @@
  */
 
 #include "hdf_pin_entry_test.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "pin_test.h"
 
 #define HDF_LOG_TAG hdf_pin_entry_test
diff --git a/framework/test/unittest/platform/entry/hdf_platform_entry_test.c b/framework/test/unittest/platform/entry/hdf_platform_entry_test.c
index f702c7ac3211b1a361724f86a83172ac4d76128b..649c3950d5788350c65ca38132daa6351223828f 100644
--- a/framework/test/unittest/platform/entry/hdf_platform_entry_test.c
+++ b/framework/test/unittest/platform/entry/hdf_platform_entry_test.c
@@ -9,7 +9,7 @@
 #include "hdf_platform_entry_test.h"
 
 #include "can_test.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "platform_device_test.h"
 #include "platform_dumper_test.h"
 #include "platform_event_test.h"
diff --git a/framework/test/unittest/platform/entry/hdf_pwm_entry_test.c b/framework/test/unittest/platform/entry/hdf_pwm_entry_test.c
index 58c816aa8a2a580e02a1c0771717289279c3b5fe..be413ee1967fafd4cc26d13f72ca76e68c6dcbfc 100644
--- a/framework/test/unittest/platform/entry/hdf_pwm_entry_test.c
+++ b/framework/test/unittest/platform/entry/hdf_pwm_entry_test.c
@@ -7,7 +7,7 @@
  */
 
 #include "hdf_pwm_entry_test.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "pwm_test.h"
 
 #define HDF_LOG_TAG hdf_pwm_entry_test
diff --git a/framework/test/unittest/platform/entry/hdf_regulator_entry_test.c b/framework/test/unittest/platform/entry/hdf_regulator_entry_test.c
index 5a9311af6d88d97f4c559d9610b262cb0ed84deb..499dc359db6e791fe94f644c3817fe42d4d5c181 100644
--- a/framework/test/unittest/platform/entry/hdf_regulator_entry_test.c
+++ b/framework/test/unittest/platform/entry/hdf_regulator_entry_test.c
@@ -7,7 +7,7 @@
  */
 
 #include "hdf_regulator_entry_test.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "regulator_test.h"
 
 #define HDF_LOG_TAG hdf_regulator_entry_test
diff --git a/framework/test/unittest/platform/entry/hdf_rtc_entry_test.c b/framework/test/unittest/platform/entry/hdf_rtc_entry_test.c
index aa999591772610e96359b188f621c233eea1d405..c55da0e974b68fc706ac8955d585908aad537ff9 100644
--- a/framework/test/unittest/platform/entry/hdf_rtc_entry_test.c
+++ b/framework/test/unittest/platform/entry/hdf_rtc_entry_test.c
@@ -7,7 +7,7 @@
  */
 
 #include "hdf_rtc_entry_test.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "rtc_test.h"
 
 #define HDF_LOG_TAG hdf_rtc_entry_test
diff --git a/framework/test/unittest/platform/entry/hdf_sdio_entry_test.c b/framework/test/unittest/platform/entry/hdf_sdio_entry_test.c
index 4b4d439d6109146c78c8ce90377dcad7fc998e07..3dae7e857228f324c9f9a588df6c76d08f76585d 100644
--- a/framework/test/unittest/platform/entry/hdf_sdio_entry_test.c
+++ b/framework/test/unittest/platform/entry/hdf_sdio_entry_test.c
@@ -7,7 +7,7 @@
  */
 
 #include "hdf_sdio_entry_test.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "sdio_if.h"
 #include "sdio_test.h"
 
diff --git a/framework/test/unittest/platform/entry/hdf_spi_entry_test.c b/framework/test/unittest/platform/entry/hdf_spi_entry_test.c
index b4769ba70391f84823efb894398ec10f22b450d3..f7e946ea8351c11a6ed89447bc2bb92302d5b190 100644
--- a/framework/test/unittest/platform/entry/hdf_spi_entry_test.c
+++ b/framework/test/unittest/platform/entry/hdf_spi_entry_test.c
@@ -7,7 +7,7 @@
  */
 
 #include "hdf_spi_entry_test.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "spi_test.h"
 
 #define HDF_LOG_TAG hdf_spi_entry_test
diff --git a/framework/test/unittest/platform/entry/hdf_timer_entry_test.c b/framework/test/unittest/platform/entry/hdf_timer_entry_test.c
index 837e9d2d2c564ad77becab1f42f29ea7295ff300..6100a456c6872bd9f868a2a5c539a9f1c023898d 100644
--- a/framework/test/unittest/platform/entry/hdf_timer_entry_test.c
+++ b/framework/test/unittest/platform/entry/hdf_timer_entry_test.c
@@ -7,7 +7,7 @@
  */
 
 #include "hdf_timer_entry_test.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "timer_test.h"
 
 #define HDF_LOG_TAG hdf_timer_entry_test
diff --git a/framework/test/unittest/platform/entry/hdf_uart_entry_test.c b/framework/test/unittest/platform/entry/hdf_uart_entry_test.c
index d29a57b7dfb04789180055375e9050ac588db5c3..77c89a66f1fe57254c85462b9bb1f6c1d91fb3b4 100644
--- a/framework/test/unittest/platform/entry/hdf_uart_entry_test.c
+++ b/framework/test/unittest/platform/entry/hdf_uart_entry_test.c
@@ -7,7 +7,7 @@
  */
 
 #include "hdf_uart_entry_test.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "uart_test.h"
 
 #define HDF_LOG_TAG hdf_uart_entry_test
diff --git a/framework/test/unittest/platform/entry/hdf_watchdog_entry_test.c b/framework/test/unittest/platform/entry/hdf_watchdog_entry_test.c
index 068f72d76fc74cdfec8d2bdd5246e7d1be4e83bb..b4697dcbe41347b32511e90db43c8bc60f3d8693 100644
--- a/framework/test/unittest/platform/entry/hdf_watchdog_entry_test.c
+++ b/framework/test/unittest/platform/entry/hdf_watchdog_entry_test.c
@@ -7,7 +7,7 @@
  */
 
 #include "hdf_watchdog_entry_test.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "watchdog_test.h"
 
 #define HDF_LOG_TAG hdf_watchdog_entry_test
diff --git a/framework/test/unittest/platform/virtual/adc_linux_virtual_iio_driver.c b/framework/test/unittest/platform/virtual/adc_linux_virtual_iio_driver.c
index 6b14e56ae2710c9d79947d56a748592ca9eb5150..b524e0a673f01159c30c27770aec5adeb0e790c1 100644
--- a/framework/test/unittest/platform/virtual/adc_linux_virtual_iio_driver.c
+++ b/framework/test/unittest/platform/virtual/adc_linux_virtual_iio_driver.c
@@ -14,7 +14,7 @@
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_base.h"
 
 #define HDF_LOG_TAG adc_iio_virtual
diff --git a/framework/test/unittest/platform/virtual/adc_virtual.c b/framework/test/unittest/platform/virtual/adc_virtual.c
index eed330b17460755bbf9dc476c612dd50db315047..4edde12e1c49b3809330605f1ccde5f2b631ed31 100644
--- a/framework/test/unittest/platform/virtual/adc_virtual.c
+++ b/framework/test/unittest/platform/virtual/adc_virtual.c
@@ -10,7 +10,7 @@
 #include "adc/adc_core.h"
 #include "device_resource_if.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 
 #define HDF_LOG_TAG adc_virtual_driver
diff --git a/framework/test/unittest/platform/virtual/clock_virtual.c b/framework/test/unittest/platform/virtual/clock_virtual.c
index c4ed400922bb89e0782cd02778589a99b3ca9fc0..3ea433ad3e822891208655b503352a5e70b7d743 100644
--- a/framework/test/unittest/platform/virtual/clock_virtual.c
+++ b/framework/test/unittest/platform/virtual/clock_virtual.c
@@ -9,7 +9,7 @@
 #include "clock/clock_core.h"
 #include "device_resource_if.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "securec.h"
 #include "hdf_base.h"
diff --git a/framework/test/unittest/platform/virtual/dac_virtual.c b/framework/test/unittest/platform/virtual/dac_virtual.c
index 6fc9cf81484c06f750a57904f6a7b94020317c3d..e798d918e9aee4176f5926bc4a169345c7e83cd3 100644
--- a/framework/test/unittest/platform/virtual/dac_virtual.c
+++ b/framework/test/unittest/platform/virtual/dac_virtual.c
@@ -10,7 +10,7 @@
 #include "asm/platform.h"
 #include "device_resource_if.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "los_hwi.h"
 #include "osal_io.h"
 #include "osal_mem.h"
diff --git a/framework/test/unittest/platform/virtual/mini/emmc_mini_virtual.c b/framework/test/unittest/platform/virtual/mini/emmc_mini_virtual.c
index e91f7540f604d7a68e446aef928a087cd4c649b0..b75f21e674c862f9e8d2302ac42ae291dec41428 100644
--- a/framework/test/unittest/platform/virtual/mini/emmc_mini_virtual.c
+++ b/framework/test/unittest/platform/virtual/mini/emmc_mini_virtual.c
@@ -7,7 +7,7 @@
  */
 
 #include "emmc_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 int32_t EmmcGetCardState(DevHandle handle, uint8_t *state, uint32_t size)
 {
diff --git a/framework/test/unittest/platform/virtual/mini/i2c_mini_virtual.c b/framework/test/unittest/platform/virtual/mini/i2c_mini_virtual.c
index 22f21985189cb4fcd32b5f4bb56074ba14c72952..9f35e7f0d4add3dd8633b621215df9da24678451 100644
--- a/framework/test/unittest/platform/virtual/mini/i2c_mini_virtual.c
+++ b/framework/test/unittest/platform/virtual/mini/i2c_mini_virtual.c
@@ -6,7 +6,7 @@
  * See the LICENSE file in the root of this repository for complete details.
  */
 
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "i2c_if.h"
 
 int32_t I2cRead(DevHandle handle, uint8_t *buf, uint16_t len)
diff --git a/framework/test/unittest/platform/virtual/mini/rtc_mini_virtual.c b/framework/test/unittest/platform/virtual/mini/rtc_mini_virtual.c
index 1490474c59b8f3f48a37afb73e6032746a5e15b7..132c63af808646c8eaaa585080b52e30099dd823 100644
--- a/framework/test/unittest/platform/virtual/mini/rtc_mini_virtual.c
+++ b/framework/test/unittest/platform/virtual/mini/rtc_mini_virtual.c
@@ -6,7 +6,7 @@
  * See the LICENSE file in the root of this repository for complete details.
  */
 
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "rtc_if.h"
 
 int32_t RtcSetTimeZone(int32_t timeZone)
diff --git a/framework/test/unittest/platform/virtual/mini/uart_mini_virtual.c b/framework/test/unittest/platform/virtual/mini/uart_mini_virtual.c
index efb6d305942fb2065eca358c896d8d0d4ca04816..315d61a9a7f3acc7d73afda32e607c21e05a7755 100644
--- a/framework/test/unittest/platform/virtual/mini/uart_mini_virtual.c
+++ b/framework/test/unittest/platform/virtual/mini/uart_mini_virtual.c
@@ -6,7 +6,7 @@
  * See the LICENSE file in the root of this repository for complete details.
  */
 
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "uart_if.h"
 
 int32_t UartBlockWrite(DevHandle handle, uint8_t *data, uint32_t size)
diff --git a/framework/test/unittest/platform/virtual/mini/watchdog_mini_virtual.c b/framework/test/unittest/platform/virtual/mini/watchdog_mini_virtual.c
index b64c5a673bd539912d1190cf9f759db70c671b07..d5cc45d3222b13f6b159256633b23423abae8646 100644
--- a/framework/test/unittest/platform/virtual/mini/watchdog_mini_virtual.c
+++ b/framework/test/unittest/platform/virtual/mini/watchdog_mini_virtual.c
@@ -6,7 +6,7 @@
  * See the LICENSE file in the root of this repository for complete details.
  */
 
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "watchdog_if.h"
 
 int32_t WatchdogBark(DevHandle handle)
diff --git a/framework/test/unittest/platform/virtual/pcie_virtual.c b/framework/test/unittest/platform/virtual/pcie_virtual.c
index a450d246faf1dbbdbaf8bde6c0c40b75c15e8087..4825a0b6ccdd522d1eea3c1b0b0e67b3622e627e 100644
--- a/framework/test/unittest/platform/virtual/pcie_virtual.c
+++ b/framework/test/unittest/platform/virtual/pcie_virtual.c
@@ -7,7 +7,7 @@
  */
 
 #include "device_resource_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "pcie_core.h"
 
diff --git a/framework/test/unittest/platform/virtual/pin_virtual.c b/framework/test/unittest/platform/virtual/pin_virtual.c
index f96180665f0ac34c06372c43e0954a2369b5d7f4..2b595876eb661e0382c557fdeb32fd66e9830766 100644
--- a/framework/test/unittest/platform/virtual/pin_virtual.c
+++ b/framework/test/unittest/platform/virtual/pin_virtual.c
@@ -7,7 +7,7 @@
  */
 
 #include "device_resource_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_io.h"
 #include "osal_mem.h"
 #include "pin/pin_core.h"
diff --git a/framework/test/unittest/platform/virtual/pwm_virtual.c b/framework/test/unittest/platform/virtual/pwm_virtual.c
index da27d095b3416b6e88be1a2fabad540e16b578f3..e035b7e70edf95113ddcc3662fa33cade79eb778 100644
--- a/framework/test/unittest/platform/virtual/pwm_virtual.c
+++ b/framework/test/unittest/platform/virtual/pwm_virtual.c
@@ -7,7 +7,7 @@
  */
 
 #include "device_resource_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_io.h"
 #include "osal_mem.h"
 #include "pwm/pwm_core.h"
diff --git a/framework/test/unittest/platform/virtual/regulator_linux_current_virtual_driver.c b/framework/test/unittest/platform/virtual/regulator_linux_current_virtual_driver.c
index 89a2208797f385639285a908dcd995a9d28a5443..a23d43192ee7e418dad2683e68c781053d673e19 100644
--- a/framework/test/unittest/platform/virtual/regulator_linux_current_virtual_driver.c
+++ b/framework/test/unittest/platform/virtual/regulator_linux_current_virtual_driver.c
@@ -15,7 +15,7 @@
 #include <linux/regulator/machine.h>
 #include <linux/regmap.h>
 #include <linux/sysfs.h>
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_base.h"
 
 #define HDF_LOG_TAG regulator_virtual_current
diff --git a/framework/test/unittest/platform/virtual/regulator_linux_voltage_virtual_driver.c b/framework/test/unittest/platform/virtual/regulator_linux_voltage_virtual_driver.c
index ac5ed7698f2e8ef35e3bd9e3598f3b8d0135c733..4da8c0a4429c554725b0eac15e5d9d8eb22d773f 100644
--- a/framework/test/unittest/platform/virtual/regulator_linux_voltage_virtual_driver.c
+++ b/framework/test/unittest/platform/virtual/regulator_linux_voltage_virtual_driver.c
@@ -15,7 +15,7 @@
 #include <linux/regulator/machine.h>
 #include <linux/regmap.h>
 #include <linux/sysfs.h>
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_base.h"
 
 #define HDF_LOG_TAG regulator_virtual
diff --git a/framework/test/unittest/platform/virtual/regulator_virtual.c b/framework/test/unittest/platform/virtual/regulator_virtual.c
index 7c17c548540a19d6eb3fc7c04dc8164e4fdd8429..e86f24bf1d1d77fb6ba4fb47b6ac6f557c51ad7c 100644
--- a/framework/test/unittest/platform/virtual/regulator_virtual.c
+++ b/framework/test/unittest/platform/virtual/regulator_virtual.c
@@ -22,7 +22,7 @@ dev  ---+-> Regulator-1(voltage) -+-> Regulator-2(voltage) -+-> Regulator-3(volt
 */
 
 #include "device_resource_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "regulator/regulator_core.h"
 
diff --git a/framework/test/unittest/platform/virtual/spi_virtual.c b/framework/test/unittest/platform/virtual/spi_virtual.c
index beca6f684781f18aaa2d7311f7e521abce41e420..5dd0e9e0776d83cd8a7b3b684f56e1d1bbc78e4e 100644
--- a/framework/test/unittest/platform/virtual/spi_virtual.c
+++ b/framework/test/unittest/platform/virtual/spi_virtual.c
@@ -8,7 +8,7 @@
 
 #include "device_resource_if.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "osal_sem.h"
 #include "osal_spinlock.h"
diff --git a/framework/test/unittest/platform/virtual/watchdog_virtual.c b/framework/test/unittest/platform/virtual/watchdog_virtual.c
index 9d3a89ac72ca75ac298626fe2243f09189ec20b3..198f26edaf4da5edce8baf1ebd5c8f3896c6f20a 100644
--- a/framework/test/unittest/platform/virtual/watchdog_virtual.c
+++ b/framework/test/unittest/platform/virtual/watchdog_virtual.c
@@ -6,7 +6,7 @@
  * See the LICENSE file in the root of this repository for complete details.
  */
 
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "watchdog/watchdog_core.h"
 
diff --git a/framework/test/unittest/pm/hdf_pm_driver_test.c b/framework/test/unittest/pm/hdf_pm_driver_test.c
index 3b0845e35ecd799cb2d634a9607bd87b185d0c7c..7c98ce6f572ec9637f77b52a51ae0ea63413c128 100644
--- a/framework/test/unittest/pm/hdf_pm_driver_test.c
+++ b/framework/test/unittest/pm/hdf_pm_driver_test.c
@@ -11,7 +11,7 @@
 #include "devsvc_manager_clnt.h"
 #include "hdf_device_desc.h"
 #include "hdf_device_node.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_pm.h"
 #include "hdf_power_manager.h"
 #include "hdf_task_queue.h"
diff --git a/framework/test/unittest/uevent/devmgr_uevent_test.c b/framework/test/unittest/uevent/devmgr_uevent_test.c
index 35882e6fb8418336b23644c91ef0e3359fd8e5ed..86ebe8491bea15be6d6531186c9a523acf3c8c24 100644
--- a/framework/test/unittest/uevent/devmgr_uevent_test.c
+++ b/framework/test/unittest/uevent/devmgr_uevent_test.c
@@ -7,7 +7,7 @@
  */
 
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG uevent_ut_driver
 
diff --git a/framework/test/unittest/utils/hcs_parser/unittest/hcs_config_test.c b/framework/test/unittest/utils/hcs_parser/unittest/hcs_config_test.c
index 2261bb258908424c6b7f246560e1bb0238b3528d..28c9153858cbc2c88cb1bbcf022676a87d092f65 100644
--- a/framework/test/unittest/utils/hcs_parser/unittest/hcs_config_test.c
+++ b/framework/test/unittest/utils/hcs_parser/unittest/hcs_config_test.c
@@ -8,7 +8,7 @@
 
 #include "hcs_config_test.h"
 #include "device_resource_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG hcs_config_test
 
diff --git a/framework/test/unittest/utils/hcs_parser/unittest/hcs_macro_cases.c b/framework/test/unittest/utils/hcs_parser/unittest/hcs_macro_cases.c
index 9682e0d530802276b0b83c9b925479a2c1e1245e..6f3642818a2aa05ec9292f49408ed4c978a3cff7 100644
--- a/framework/test/unittest/utils/hcs_parser/unittest/hcs_macro_cases.c
+++ b/framework/test/unittest/utils/hcs_parser/unittest/hcs_macro_cases.c
@@ -6,7 +6,7 @@
  * See the LICENSE file in the root of this repository for complete details.
  */
 
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hcs_macro.h"
 #include "hdf_macro_test.h"
 
diff --git a/framework/test/unittest/wifi/hdf_wifi_test.c b/framework/test/unittest/wifi/hdf_wifi_test.c
index 6d975c2ec7031b5ebf5a65d81986ddf070f04a70..fe1b9c9f371d3053eef68e668eccf054c6733e35 100644
--- a/framework/test/unittest/wifi/hdf_wifi_test.c
+++ b/framework/test/unittest/wifi/hdf_wifi_test.c
@@ -9,7 +9,7 @@
 #include "hdf_wifi_test.h"
 #include "flow_control_test.h"
 #include "hdf_module_test.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_message_test.h"
 #include "hdf_netbuf_test.h"
 #include "net_device_test.h"
diff --git a/framework/tools/hdf_dev_eco_tool/resources/templates/lite/display_template/display_driver_head.template b/framework/tools/hdf_dev_eco_tool/resources/templates/lite/display_template/display_driver_head.template
index a7f4bc8576b259b41a94029cfb8b03e370d2dbcb..b35bd67e6d479e6680dcd58a6a91bf6bd751bc42 100644
--- a/framework/tools/hdf_dev_eco_tool/resources/templates/lite/display_template/display_driver_head.template
+++ b/framework/tools/hdf_dev_eco_tool/resources/templates/lite/display_template/display_driver_head.template
@@ -3,7 +3,7 @@
 #include "gpio_if.h"
 #include "hdf_bl.h"
 #include "hdf_disp.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "mipi_dsi_if.h"
 #include "osal.h"
 #include "pwm_if.h"
diff --git a/framework/tools/hdf_dev_eco_tool/resources/templates/lite/hdf_driver.c.template b/framework/tools/hdf_dev_eco_tool/resources/templates/lite/hdf_driver.c.template
index 3ec5439c8ad360595e1042cab4e027b2ece59edb..c38ea942f033007eeed463f61047625509323321 100755
--- a/framework/tools/hdf_dev_eco_tool/resources/templates/lite/hdf_driver.c.template
+++ b/framework/tools/hdf_dev_eco_tool/resources/templates/lite/hdf_driver.c.template
@@ -1,5 +1,5 @@
 #include "hdf_device_desc.h"  // Header file that describes the APIs provided by the HDF to the driver.
-#include "hdf_log.h"          // Header file that describes the log APIs provided by the HDF.
+#include "hdf_core_log.h"          // Header file that describes the log APIs provided by the HDF.
 
 #define HDF_LOG_TAG ${driver_lower_case}_driver   // Tag contained in logs. If no tag is not specified, the default HDF_TAG is used.
 
diff --git a/framework/tools/hdf_dev_eco_tool/resources/templates/lite/hdi_template/unittest/hdf_name_test_cpp.template b/framework/tools/hdf_dev_eco_tool/resources/templates/lite/hdi_template/unittest/hdf_name_test_cpp.template
index ae4037e1b6f4a1ae8aef5f56a2c4a005c463e38f..d1d370f4dcaaf66df7e1557d245fc9b08e16e6e4 100644
--- a/framework/tools/hdf_dev_eco_tool/resources/templates/lite/hdi_template/unittest/hdf_name_test_cpp.template
+++ b/framework/tools/hdf_dev_eco_tool/resources/templates/lite/hdi_template/unittest/hdf_name_test_cpp.template
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 #include <osal_mem.h>
 #include <unistd.h>
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "v1_0/i${peripheral_name}.h"
 #include "v1_0/types.h"
 #include "${peripheral_name}_callback_impl.h"
diff --git a/framework/tools/hdf_dev_eco_tool/resources/templates/lite/input_template/input_driver_source.template b/framework/tools/hdf_dev_eco_tool/resources/templates/lite/input_template/input_driver_source.template
index b23142414fd2732d018fbae4059fbb4fcf906123..e74f35b0b8bafce362c3610ab02635612ba94e13 100644
--- a/framework/tools/hdf_dev_eco_tool/resources/templates/lite/input_template/input_driver_source.template
+++ b/framework/tools/hdf_dev_eco_tool/resources/templates/lite/input_template/input_driver_source.template
@@ -1,7 +1,7 @@
 #include <securec.h>
 #include "osal_mem.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_touch.h"
 #include "input_i2c_ops.h"
 #include "${include_file}"
diff --git a/framework/tools/hdi-gen/codegen/c_client_proxy_code_emitter.cpp b/framework/tools/hdi-gen/codegen/c_client_proxy_code_emitter.cpp
index 314f34e54fede3af9f39d069c20c7ba4268b9c76..4912b5307e50f01b7ebb21ffb063eef45c685f2e 100644
--- a/framework/tools/hdi-gen/codegen/c_client_proxy_code_emitter.cpp
+++ b/framework/tools/hdi-gen/codegen/c_client_proxy_code_emitter.cpp
@@ -158,7 +158,7 @@ void CClientProxyCodeEmitter::EmitProxyInclusions(StringBuilder &sb)
 void CClientProxyCodeEmitter::GetHeaderOtherLibInclusions(HeaderFile::HeaderFileSet &headerFiles) const
 {
     headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "hdf_base");
-    headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "hdf_log");
+    headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "hdf_core_log");
     headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "hdf_sbuf");
     headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "osal_mem");
     headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "securec");
diff --git a/framework/tools/hdi-gen/codegen/c_custom_types_code_emitter.cpp b/framework/tools/hdi-gen/codegen/c_custom_types_code_emitter.cpp
index e46ced531985f6c5fc24cedaa5b41d837ffe3c80..bd3a64da0068bc7b9c804c951ed1b76605f0cd53 100644
--- a/framework/tools/hdi-gen/codegen/c_custom_types_code_emitter.cpp
+++ b/framework/tools/hdi-gen/codegen/c_custom_types_code_emitter.cpp
@@ -245,7 +245,7 @@ void CCustomTypesCodeEmitter::EmitSoucreInclusions(StringBuilder &sb)
 
 void CCustomTypesCodeEmitter::GetSourceOtherLibInclusions(HeaderFile::HeaderFileSet &headerFiles) const
 {
-    headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "hdf_log");
+    headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "hdf_core_log");
     headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "hdf_sbuf");
     headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "osal_mem");
     headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "securec");
diff --git a/framework/tools/hdi-gen/codegen/c_service_driver_code_emitter.cpp b/framework/tools/hdi-gen/codegen/c_service_driver_code_emitter.cpp
index 673581414fbc0478859f12e68feb1c12eb0751cf..8a396b5ae56c96d5beb210073cf73cae6428cc30 100644
--- a/framework/tools/hdi-gen/codegen/c_service_driver_code_emitter.cpp
+++ b/framework/tools/hdi-gen/codegen/c_service_driver_code_emitter.cpp
@@ -85,7 +85,7 @@ void CServiceDriverCodeEmitter::EmitLowDriverInclusions(StringBuilder &sb) const
 {
     HeaderFile::HeaderFileSet headerFiles;
     headerFiles.emplace(HeaderFileType::OWN_MODULE_HEADER_FILE, EmitVersionHeaderName(implName_));
-    headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "hdf_log");
+    headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "hdf_core_log");
     headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "hdf_device_desc");
     
     for (const auto &file : headerFiles) {
@@ -186,7 +186,7 @@ void CServiceDriverCodeEmitter::EmitDriverInclusions(StringBuilder &sb)
 void CServiceDriverCodeEmitter::GetDriverSourceOtherLibInclusions(HeaderFile::HeaderFileSet &headerFiles) const
 {
     headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "hdf_base");
-    headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "hdf_log");
+    headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "hdf_core_log");
     headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "osal_mem");
     headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "hdf_device_desc");
     if (mode_ != GenMode::KERNEL) {
diff --git a/framework/tools/hdi-gen/codegen/c_service_impl_code_emitter.cpp b/framework/tools/hdi-gen/codegen/c_service_impl_code_emitter.cpp
index a1b0449ef41c278ac7964e1094a8b998d41e1736..585aab229968cdfb0004188f277d91af69cb8b00 100644
--- a/framework/tools/hdi-gen/codegen/c_service_impl_code_emitter.cpp
+++ b/framework/tools/hdi-gen/codegen/c_service_impl_code_emitter.cpp
@@ -262,7 +262,7 @@ void CServiceImplCodeEmitter::EmitServiceImplSourceInclusions(StringBuilder &sb)
 void CServiceImplCodeEmitter::GetSourceOtherLibInclusions(HeaderFile::HeaderFileSet &headerFiles) const
 {
     headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "hdf_base");
-    headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "hdf_log");
+    headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "hdf_core_log");
     headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "osal_mem");
     headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "securec");
 }
diff --git a/framework/tools/hdi-gen/codegen/c_service_stub_code_emitter.cpp b/framework/tools/hdi-gen/codegen/c_service_stub_code_emitter.cpp
index 802234399a8c4eae1843d3234710a644862fdd47..7744fecb03bb1a62c96481d7811b5093b936ec36 100644
--- a/framework/tools/hdi-gen/codegen/c_service_stub_code_emitter.cpp
+++ b/framework/tools/hdi-gen/codegen/c_service_stub_code_emitter.cpp
@@ -195,7 +195,7 @@ void CServiceStubCodeEmitter::GetSourceOtherLibInclusions(HeaderFile::HeaderFile
     }
 
     headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "hdf_base");
-    headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "hdf_log");
+    headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "hdf_core_log");
     headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "osal_mem");
 }
 
diff --git a/framework/tools/hdi-gen/codegen/cpp_client_proxy_code_emitter.cpp b/framework/tools/hdi-gen/codegen/cpp_client_proxy_code_emitter.cpp
index b610d7caa7909154c3c671efdcd2b488f00d9e69..1cb97a21f5b8d1e67c7f8b404bcb5de7b06658f5 100644
--- a/framework/tools/hdi-gen/codegen/cpp_client_proxy_code_emitter.cpp
+++ b/framework/tools/hdi-gen/codegen/cpp_client_proxy_code_emitter.cpp
@@ -327,7 +327,7 @@ void CppClientProxyCodeEmitter::EmitPassthroughProxySourceInclusions(StringBuild
         headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "string_ex");
     }
     headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "hdi_support");
-    headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "hdf_log");
+    headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "hdf_core_log");
 
     for (const auto &file : headerFiles) {
         sb.AppendFormat("%s\n", file.ToString().c_str());
@@ -405,7 +405,7 @@ void CppClientProxyCodeEmitter::GetSourceOtherLibInclusions(HeaderFile::HeaderFi
         headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "iservmgr_hdi");
     }
     headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "hdf_base");
-    headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "hdf_log");
+    headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "hdf_core_log");
     headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "message_option");
     headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "message_parcel");
     headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "hdi_support");
diff --git a/framework/tools/hdi-gen/codegen/cpp_custom_types_code_emitter.cpp b/framework/tools/hdi-gen/codegen/cpp_custom_types_code_emitter.cpp
index 29be0230386eda6732cbb5fdb083dc31149e2a21..ade5944481944d1da4deccf02a07f82b15d1f4ca 100644
--- a/framework/tools/hdi-gen/codegen/cpp_custom_types_code_emitter.cpp
+++ b/framework/tools/hdi-gen/codegen/cpp_custom_types_code_emitter.cpp
@@ -253,7 +253,7 @@ void CppCustomTypesCodeEmitter::EmitSourceFileInclusions(StringBuilder &sb)
 
 void CppCustomTypesCodeEmitter::GetSourceOtherLibInclusions(HeaderFile::HeaderFileSet &headerFiles) const
 {
-    headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "hdf_log");
+    headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "hdf_core_log");
     headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "securec");
     headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "message_parcel");
 }
diff --git a/framework/tools/hdi-gen/codegen/cpp_service_driver_code_emitter.cpp b/framework/tools/hdi-gen/codegen/cpp_service_driver_code_emitter.cpp
index cae9fdfb4c7216012051b13c91fd34c584f2c952..9c9be15e1ab5a3b927fb358a431cc3e2cbf84e7a 100644
--- a/framework/tools/hdi-gen/codegen/cpp_service_driver_code_emitter.cpp
+++ b/framework/tools/hdi-gen/codegen/cpp_service_driver_code_emitter.cpp
@@ -74,7 +74,7 @@ void CppServiceDriverCodeEmitter::EmitDriverInclusions(StringBuilder &sb)
     HeaderFile::HeaderFileSet headerFiles;
 
     headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "hdf_base");
-    headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "hdf_log");
+    headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "hdf_core_log");
     headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "hdf_device_desc");
     headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "hdf_sbuf_ipc");
     headerFiles.emplace(HeaderFileType::OWN_MODULE_HEADER_FILE, EmitVersionHeaderName(stubName_));
diff --git a/framework/tools/hdi-gen/codegen/cpp_service_stub_code_emitter.cpp b/framework/tools/hdi-gen/codegen/cpp_service_stub_code_emitter.cpp
index bd034723f7294aac200cb0b1d2188b03a6fe4b99..093e9132ba2e2b96ae78e287b142d9b07b2e43e1 100644
--- a/framework/tools/hdi-gen/codegen/cpp_service_stub_code_emitter.cpp
+++ b/framework/tools/hdi-gen/codegen/cpp_service_stub_code_emitter.cpp
@@ -253,7 +253,7 @@ void CppServiceStubCodeEmitter::GetSourceOtherLibInclusions(HeaderFile::HeaderFi
     }
 
     headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "hdf_base");
-    headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "hdf_log");
+    headerFiles.emplace(HeaderFileType::OTHER_MODULES_HEADER_FILE, "hdf_core_log");
 }
 
 void CppServiceStubCodeEmitter::GetSourceOtherFileInclusions(HeaderFile::HeaderFileSet &headerFiles) const
diff --git a/framework/tools/hdi-gen/test/unittest/02_standard_interface_idl/target/foo/v1_0/foo_proxy.cpp.txt b/framework/tools/hdi-gen/test/unittest/02_standard_interface_idl/target/foo/v1_0/foo_proxy.cpp.txt
index c9d049120d85f2c27181eea0a0b4137329dd8409..09b785e5d5d5f35a509036b939dfb270c478e7e7 100644
--- a/framework/tools/hdi-gen/test/unittest/02_standard_interface_idl/target/foo/v1_0/foo_proxy.cpp.txt
+++ b/framework/tools/hdi-gen/test/unittest/02_standard_interface_idl/target/foo/v1_0/foo_proxy.cpp.txt
@@ -1,6 +1,6 @@
 #include "v1_0/foo_proxy.h"
 #include <hdf_base.h>
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include <hdi_support.h>
 #include <iservmgr_hdi.h>
 #include <message_option.h>
diff --git a/framework/tools/hdi-gen/test/unittest/02_standard_interface_idl/target/foo/v1_0/foo_stub.cpp.txt b/framework/tools/hdi-gen/test/unittest/02_standard_interface_idl/target/foo/v1_0/foo_stub.cpp.txt
index 789ee38071c153b047a9d32e1c8d9fc6e7cbc85b..f1514c742489a8f1bbd59753cfebf12dc11e2325 100644
--- a/framework/tools/hdi-gen/test/unittest/02_standard_interface_idl/target/foo/v1_0/foo_stub.cpp.txt
+++ b/framework/tools/hdi-gen/test/unittest/02_standard_interface_idl/target/foo/v1_0/foo_stub.cpp.txt
@@ -1,6 +1,6 @@
 #include "v1_0/foo_stub.h"
 #include <hdf_base.h>
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include <hdi_support.h>
 #include <securec.h>
 #include <string_ex.h>
diff --git a/framework/tools/hdi-gen/test/unittest/03_standard_callback_idl/target/foo/v1_0/foo_callback_proxy.cpp.txt b/framework/tools/hdi-gen/test/unittest/03_standard_callback_idl/target/foo/v1_0/foo_callback_proxy.cpp.txt
index 5604be42220d29e146d51c41e440bbabaecbca57..6319e028691f7e2d3646a0d3935c7c82c94e7d22 100644
--- a/framework/tools/hdi-gen/test/unittest/03_standard_callback_idl/target/foo/v1_0/foo_callback_proxy.cpp.txt
+++ b/framework/tools/hdi-gen/test/unittest/03_standard_callback_idl/target/foo/v1_0/foo_callback_proxy.cpp.txt
@@ -1,6 +1,6 @@
 #include "v1_0/foo_callback_proxy.h"
 #include <hdf_base.h>
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include <hdi_support.h>
 #include <message_option.h>
 #include <message_parcel.h>
diff --git a/framework/tools/hdi-gen/test/unittest/03_standard_callback_idl/target/foo/v1_0/foo_callback_stub.cpp.txt b/framework/tools/hdi-gen/test/unittest/03_standard_callback_idl/target/foo/v1_0/foo_callback_stub.cpp.txt
index 3dc7df1d6ffe9d5ca1a19ad5ce539897645ff60a..78dc598420e4734fc115976e1d71352b649aa8e4 100644
--- a/framework/tools/hdi-gen/test/unittest/03_standard_callback_idl/target/foo/v1_0/foo_callback_stub.cpp.txt
+++ b/framework/tools/hdi-gen/test/unittest/03_standard_callback_idl/target/foo/v1_0/foo_callback_stub.cpp.txt
@@ -1,6 +1,6 @@
 #include "v1_0/foo_callback_stub.h"
 #include <hdf_base.h>
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 
 #define HDF_LOG_TAG    foo_callback_stub
 
diff --git a/framework/tools/hdi-gen/test/unittest/04_extended_interface_idl/target/foo/v1_1/foo_proxy.cpp.txt b/framework/tools/hdi-gen/test/unittest/04_extended_interface_idl/target/foo/v1_1/foo_proxy.cpp.txt
index 56e57fe0d171fb06b3f1ed42dfb16dfee48d3f74..ad8c7916159ebfe4ed5c7295c8e0ac548971a97a 100644
--- a/framework/tools/hdi-gen/test/unittest/04_extended_interface_idl/target/foo/v1_1/foo_proxy.cpp.txt
+++ b/framework/tools/hdi-gen/test/unittest/04_extended_interface_idl/target/foo/v1_1/foo_proxy.cpp.txt
@@ -1,6 +1,6 @@
 #include "v1_1/foo_proxy.h"
 #include <hdf_base.h>
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include <hdi_support.h>
 #include <iservmgr_hdi.h>
 #include <message_option.h>
diff --git a/framework/tools/hdi-gen/test/unittest/04_extended_interface_idl/target/foo/v1_1/foo_stub.cpp.txt b/framework/tools/hdi-gen/test/unittest/04_extended_interface_idl/target/foo/v1_1/foo_stub.cpp.txt
index 30ba2b36da3b864e602690605b09514fde509e08..bb79f5764755b346ae818de3fc6c05fd933e4d90 100644
--- a/framework/tools/hdi-gen/test/unittest/04_extended_interface_idl/target/foo/v1_1/foo_stub.cpp.txt
+++ b/framework/tools/hdi-gen/test/unittest/04_extended_interface_idl/target/foo/v1_1/foo_stub.cpp.txt
@@ -1,6 +1,6 @@
 #include "v1_1/foo_stub.h"
 #include <hdf_base.h>
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include <hdi_support.h>
 #include <securec.h>
 #include <string_ex.h>
diff --git a/framework/tools/hdi-gen/test/unittest/05_types_idl/target/foo/v1_0/types.cpp.txt b/framework/tools/hdi-gen/test/unittest/05_types_idl/target/foo/v1_0/types.cpp.txt
index d86b2abc8503215cd2419cc04f554a4006781c84..145f18adc96130305e6ddeccf05fbc346f9110cd 100644
--- a/framework/tools/hdi-gen/test/unittest/05_types_idl/target/foo/v1_0/types.cpp.txt
+++ b/framework/tools/hdi-gen/test/unittest/05_types_idl/target/foo/v1_0/types.cpp.txt
@@ -1,5 +1,5 @@
 #include "v1_0/types.h"
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include <message_parcel.h>
 #include <securec.h>
 
diff --git a/framework/tools/hdi-gen/test/unittest/06_extended_enum_idl/target/foo/v1_0/types.cpp.txt b/framework/tools/hdi-gen/test/unittest/06_extended_enum_idl/target/foo/v1_0/types.cpp.txt
index e287186b461acb1f72e45fc0934deffb2b9d8c81..ae2844fcb5d8ef6463e601fbdf4e822fc3a339fb 100644
--- a/framework/tools/hdi-gen/test/unittest/06_extended_enum_idl/target/foo/v1_0/types.cpp.txt
+++ b/framework/tools/hdi-gen/test/unittest/06_extended_enum_idl/target/foo/v1_0/types.cpp.txt
@@ -1,5 +1,5 @@
 #include "v1_0/types.h"
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include <message_parcel.h>
 #include <securec.h>
 
diff --git a/framework/tools/hdi-gen/test/unittest/07_extended_struct_idl/target/foo/v1_0/types.cpp.txt b/framework/tools/hdi-gen/test/unittest/07_extended_struct_idl/target/foo/v1_0/types.cpp.txt
index 9bea95eab47eb64f687670696532876af6d7644f..533a88df1445a30cae8b5da99a2bbe70c45da4a6 100644
--- a/framework/tools/hdi-gen/test/unittest/07_extended_struct_idl/target/foo/v1_0/types.cpp.txt
+++ b/framework/tools/hdi-gen/test/unittest/07_extended_struct_idl/target/foo/v1_0/types.cpp.txt
@@ -1,5 +1,5 @@
 #include "v1_0/types.h"
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include <message_parcel.h>
 #include <securec.h>
 
diff --git a/framework/tools/hdi-gen/test/unittest/08_overload_method_idl/target/foo/v1_1/foo_proxy.cpp.txt b/framework/tools/hdi-gen/test/unittest/08_overload_method_idl/target/foo/v1_1/foo_proxy.cpp.txt
index 9e9b296d8422cccad54ca4c0b7e32e29825d2485..31f929231722ff5559c8df0f807fdb96f85ca2a8 100644
--- a/framework/tools/hdi-gen/test/unittest/08_overload_method_idl/target/foo/v1_1/foo_proxy.cpp.txt
+++ b/framework/tools/hdi-gen/test/unittest/08_overload_method_idl/target/foo/v1_1/foo_proxy.cpp.txt
@@ -1,6 +1,6 @@
 #include "v1_1/foo_proxy.h"
 #include <hdf_base.h>
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include <hdi_support.h>
 #include <iservmgr_hdi.h>
 #include <message_option.h>
diff --git a/framework/tools/hdi-gen/test/unittest/08_overload_method_idl/target/foo/v1_1/foo_stub.cpp.txt b/framework/tools/hdi-gen/test/unittest/08_overload_method_idl/target/foo/v1_1/foo_stub.cpp.txt
index 354eaa4d2e8cc267eb0c2bb17889b4ca2d315cd6..0d0c24dcf1008e66162d0388b2fdcd947239fab0 100644
--- a/framework/tools/hdi-gen/test/unittest/08_overload_method_idl/target/foo/v1_1/foo_stub.cpp.txt
+++ b/framework/tools/hdi-gen/test/unittest/08_overload_method_idl/target/foo/v1_1/foo_stub.cpp.txt
@@ -1,6 +1,6 @@
 #include "v1_1/foo_stub.h"
 #include <hdf_base.h>
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include <hdi_support.h>
 #include <securec.h>
 #include <string_ex.h>
diff --git a/framework/utils/src/hcs_parser/device_resource_if.c b/framework/utils/src/hcs_parser/device_resource_if.c
index 03c1aa6c117f5865ef89da41f3aab00601428c35..f54c48fe194db9d478f96b793a9f9a8c91e49034 100644
--- a/framework/utils/src/hcs_parser/device_resource_if.c
+++ b/framework/utils/src/hcs_parser/device_resource_if.c
@@ -8,7 +8,7 @@
 
 #include "device_resource_if.h"
 #include "hcs_tree_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 static void HcsIfaceConstruct(struct DeviceResourceIface *instance)
 {
diff --git a/framework/utils/src/hcs_parser/hcs_blob_if.c b/framework/utils/src/hcs_parser/hcs_blob_if.c
index c8d7cef82561d8a7894e975f86e8d595de9a0ce6..e5c64a98019a6a24de663e9c02af49a0c12673e1 100644
--- a/framework/utils/src/hcs_parser/hcs_blob_if.c
+++ b/framework/utils/src/hcs_parser/hcs_blob_if.c
@@ -7,7 +7,7 @@
  */
 
 #include "hcs_blob_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG hcs_blob_if
 
diff --git a/framework/utils/src/hcs_parser/hcs_buildin_parser.c b/framework/utils/src/hcs_parser/hcs_buildin_parser.c
index c2c2f50ffcc0d5b80bbf6449a06d25ea944cd54c..25f7094d4e43f77bda4469d63e60ebfc6fe3b5b5 100644
--- a/framework/utils/src/hcs_parser/hcs_buildin_parser.c
+++ b/framework/utils/src/hcs_parser/hcs_buildin_parser.c
@@ -10,7 +10,7 @@
 #include "hcs_parser.h"
 #include "hcs_tree_if.h"
 #include "hdf_base.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG hcs_parser
 
diff --git a/framework/utils/src/hcs_parser/hcs_generate_tree.c b/framework/utils/src/hcs_parser/hcs_generate_tree.c
index c3afe7831f7b4d976e411151f93d84dde366c788..2c91e872cf011073a2c9a60801b0f16c70063935 100644
--- a/framework/utils/src/hcs_parser/hcs_generate_tree.c
+++ b/framework/utils/src/hcs_parser/hcs_generate_tree.c
@@ -8,7 +8,7 @@
 
 #include "hcs_generate_tree.h"
 #include "hcs_blob_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 
 #define HDF_LOG_TAG hcs_generate_tree
diff --git a/framework/utils/src/hcs_parser/hcs_parser.c b/framework/utils/src/hcs_parser/hcs_parser.c
index b12380ff7bae5fe96ebb9b8158a37255f20fb98e..5cfe88d8cfdebcf8e942e92479608ddc3e57b043 100644
--- a/framework/utils/src/hcs_parser/hcs_parser.c
+++ b/framework/utils/src/hcs_parser/hcs_parser.c
@@ -9,7 +9,7 @@
 #include "hcs_parser.h"
 #include "hcs_blob_if.h"
 #include "hcs_generate_tree.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 
 #define HDF_LOG_TAG hcs_parser
diff --git a/framework/utils/src/hcs_parser/hcs_tree_if.c b/framework/utils/src/hcs_parser/hcs_tree_if.c
index ab1f8087f2bc7ed070fc557aa877624612cf65dc..edeb5c602044ab48a429965d9445b251f3eaca49 100644
--- a/framework/utils/src/hcs_parser/hcs_tree_if.c
+++ b/framework/utils/src/hcs_parser/hcs_tree_if.c
@@ -8,7 +8,7 @@
 
 #include "hcs_tree_if.h"
 #include "hcs_blob_if.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG hcs_tree_if
 
diff --git a/framework/utils/src/hdf_cstring.c b/framework/utils/src/hdf_cstring.c
index 924d10a652991fb532b1b8ef37f3b76e350deb71..0db8ea2034f235c4a9c59cc5115be2a46ac64fcd 100644
--- a/framework/utils/src/hdf_cstring.c
+++ b/framework/utils/src/hdf_cstring.c
@@ -7,7 +7,7 @@
  */
 
 #include "hdf_cstring.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "securec.h"
 
diff --git a/framework/utils/src/hdf_message_looper.c b/framework/utils/src/hdf_message_looper.c
index d30ee279e5411f4ee7d353206065c7cb340aab1c..55f101946ec093d2d61c90d5f127ebe11106b2d3 100644
--- a/framework/utils/src/hdf_message_looper.c
+++ b/framework/utils/src/hdf_message_looper.c
@@ -9,7 +9,7 @@
 #include "hdf_message_looper.h"
 #include "hdf_message_task.h"
 #include "osal_message.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 void HdfMessageLooperStart(struct HdfMessageLooper *looper)
 {
diff --git a/framework/utils/src/hdf_sbuf.c b/framework/utils/src/hdf_sbuf.c
index f3d99de5782a8ec62b25cb5b4298c9a4c8a8848b..0773a0681bd54f2608710af54c137e9521c56929 100644
--- a/framework/utils/src/hdf_sbuf.c
+++ b/framework/utils/src/hdf_sbuf.c
@@ -7,7 +7,7 @@
  */
 
 #include "hdf_sbuf.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_sbuf_impl.h"
 #include "osal_mem.h"
 
diff --git a/framework/utils/src/hdf_sbuf_impl_raw.c b/framework/utils/src/hdf_sbuf_impl_raw.c
index bdf2ec578d7cd2221d040f82489e836b5d0904f2..a38211083907704a6ea0c4fcda0bcd31c70278ac 100644
--- a/framework/utils/src/hdf_sbuf_impl_raw.c
+++ b/framework/utils/src/hdf_sbuf_impl_raw.c
@@ -6,7 +6,7 @@
  * See the LICENSE file in the root of this repository for complete details.
  */
 
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "hdf_sbuf.h"
 #include "hdf_sbuf_impl.h"
 #include "osal_mem.h"
diff --git a/framework/utils/src/hdf_slist.c b/framework/utils/src/hdf_slist.c
index 7a46ebb94df8b816053d21edf41c6337e6aafdc2..e4734cb312deadc414b95feb074429ef5c6e869c 100644
--- a/framework/utils/src/hdf_slist.c
+++ b/framework/utils/src/hdf_slist.c
@@ -7,7 +7,7 @@
  */
 
 #include "hdf_slist.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG utils_slist
 
diff --git a/framework/utils/src/hdf_sref.c b/framework/utils/src/hdf_sref.c
index 0df652bed0f8b025d7c285548b1a61f671ccf4a4..cbfe48af752753cf874925768460228678adaf66 100644
--- a/framework/utils/src/hdf_sref.c
+++ b/framework/utils/src/hdf_sref.c
@@ -7,7 +7,7 @@
  */
 
 #include "hdf_sref.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 
 #define HDF_LOG_TAG hdf_sref
 
diff --git a/framework/utils/src/hdf_task_queue.c b/framework/utils/src/hdf_task_queue.c
index 4946d8400d272b1abbb02adfe30d57ff4eb03e52..66f7376cb889d71095ccf014513238a060cc7b6c 100644
--- a/framework/utils/src/hdf_task_queue.c
+++ b/framework/utils/src/hdf_task_queue.c
@@ -7,7 +7,7 @@
  */
 
 #include "hdf_task_queue.h"
-#include "hdf_log.h"
+#include "hdf_core_log.h"
 #include "osal_mem.h"
 #include "securec.h"
 
diff --git a/interfaces/inner_api/hdi/base/hdi_smq.h b/interfaces/inner_api/hdi/base/hdi_smq.h
index e10e62e6c8574bfa14cd72c3088d258a7ed9291c..8ea7ae55d766c3eda53f267164f22806a7187d52 100644
--- a/interfaces/inner_api/hdi/base/hdi_smq.h
+++ b/interfaces/inner_api/hdi/base/hdi_smq.h
@@ -45,7 +45,7 @@
 #include <cerrno>
 #include <datetime_ex.h>
 #include <hdf_base.h>
-#include <hdf_log.h>
+#include <hdf_core_log.h>
 #include <base/hdi_smq_meta.h>
 #include <base/hdi_smq_syncer.h>
 #include <memory>
diff --git a/interfaces/inner_api/osal/uhdf/hdf_log_adapter.h b/interfaces/inner_api/osal/uhdf/hdf_log_adapter.h
index a27a0fb978c9a36396f6ef2c6141266af1e99716..dd50551a544e670494e2de468d1c2c57550c440a 100644
--- a/interfaces/inner_api/osal/uhdf/hdf_log_adapter.h
+++ b/interfaces/inner_api/osal/uhdf/hdf_log_adapter.h
@@ -42,12 +42,6 @@
 extern "C" {
 #endif /* __cplusplus */
 
-/**
- * @brief Defines the log domain of the HDF.
- */
-#undef LOG_DOMAIN
-#define LOG_DOMAIN 0xD002510
-
 /**
  * @brief Defines the default log label of the HDF.
  */
diff --git a/interfaces/inner_api/utils/hdf_core_log.h b/interfaces/inner_api/utils/hdf_core_log.h
new file mode 100644
index 0000000000000000000000000000000000000000..f57bc0788ccee19ca2978c7601b82f44f2d80ce3
--- /dev/null
+++ b/interfaces/inner_api/utils/hdf_core_log.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef HDF_CORE_LOG_H
+#define HDF_CORE_LOG_H
+
+#include "hdf_log.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/**
+ * @brief Defines the log domain of the HDF.
+ */
+#undef LOG_DOMAIN
+#define LOG_DOMAIN 0xD002510
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* HDF_CORE_LOG_H */
\ No newline at end of file