From df7ba20069d2142dff1efdaaad93184444306da5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=98=E6=99=A8=E9=98=B3?= <690928667@qq.com>
Date: Fri, 28 Jun 2024 04:48:44 +0000
Subject: [PATCH 1/9] =?UTF-8?q?update=20adapter/khdf/linux/platform/uart/u?=
 =?UTF-8?q?art=5Fadapter.c.=20Signed-off-by:=20=E4=BB=98=E6=B8=85=E9=91=AB?=
 =?UTF-8?q?=20<690928667@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 付晨阳 <690928667@qq.com>
---
 .../khdf/linux/platform/uart/uart_adapter.c   | 59 ++++++++++++++-----
 1 file changed, 44 insertions(+), 15 deletions(-)

diff --git a/adapter/khdf/linux/platform/uart/uart_adapter.c b/adapter/khdf/linux/platform/uart/uart_adapter.c
index e8bac7820..62062327f 100644
--- a/adapter/khdf/linux/platform/uart/uart_adapter.c
+++ b/adapter/khdf/linux/platform/uart/uart_adapter.c
@@ -34,19 +34,24 @@
 #define UART_NAME_LEN 20
 #define UART_PATHNAME_LEN (UART_NAME_LEN + 20)
 
-static char g_driverName[UART_NAME_LEN];
-
+//static char g_driverName[UART_NAME_LEN];
+struct UartPriv{
+    struct file *fp;
+    char   g_driverName[UART_NAME_LEN];
+};
 static int32_t UartAdapterInit(struct UartHost *host)
 {
     char name[UART_PATHNAME_LEN] = {0};
     struct file *fp = NULL;
+    struct UartPriv *uartpriv = NULL;
     mm_segment_t oldfs;
 
     if (host == NULL) {
         HDF_LOGE("UartAdapterInit: host is null!");
         return HDF_ERR_INVALID_OBJECT;
     }
-    if (sprintf_s(name, UART_PATHNAME_LEN - 1, "/dev/%s%d", g_driverName, host->num) < 0) {
+    uartpriv = (struct UartPriv *)host->priv;
+    if (sprintf_s(name, UART_PATHNAME_LEN - 1, "/dev/%s%d", uartpriv->g_driverName, host->num) < 0) {
         return HDF_FAILURE;
     }
     oldfs = get_fs();
@@ -65,20 +70,22 @@ static int32_t UartAdapterInit(struct UartHost *host)
 static int32_t UartAdapterDeInit(struct UartHost *host)
 {
     struct file *fp = NULL;
+    struct UartPriv *uartpriv = NULL;
     mm_segment_t oldfs;
 
     if (host == NULL) {
         HDF_LOGE("UartAdapterDeInit: host is null!");
         return HDF_ERR_INVALID_OBJECT;
     }
-    fp = (struct file *)host->priv;
+    uartpriv = (struct UartPriv *)host->priv;
+    fp = uartpriv->fp;
     oldfs = get_fs();
     set_fs(KERNEL_DS);
     if (!IS_ERR(fp) && fp) {
         filp_close(fp, NULL);
     }
     set_fs(oldfs);
-    host->priv = NULL;
+    uartpriv->fp = NULL;
     return HDF_SUCCESS;
 }
 
@@ -87,6 +94,7 @@ static int32_t UartAdapterRead(struct UartHost *host, uint8_t *data, uint32_t si
     loff_t pos = 0;
     int ret;
     struct file *fp = NULL;
+    struct UartPriv *uartpriv = NULL;
     char *p = (char *)data;
     mm_segment_t oldfs;
     uint32_t tmp = 0;
@@ -96,7 +104,8 @@ static int32_t UartAdapterRead(struct UartHost *host, uint8_t *data, uint32_t si
         return HDF_ERR_INVALID_OBJECT;
     }
 
-    fp = (struct file *)host->priv;
+    uartpriv = (struct UartPriv *)host->priv;
+    fp = uartpriv->fp;
     oldfs = get_fs();
     set_fs(KERNEL_DS);
     while (size >= tmp) {
@@ -116,6 +125,7 @@ static int32_t UartAdapterWrite(struct UartHost *host, uint8_t *data, uint32_t s
     loff_t pos = 0;
     int ret;
     struct file *fp = NULL;
+    struct UartPriv *uartpriv = NULL;
     char *p = (char *)data;
     mm_segment_t oldfs;
 
@@ -124,7 +134,8 @@ static int32_t UartAdapterWrite(struct UartHost *host, uint8_t *data, uint32_t s
         return HDF_ERR_INVALID_OBJECT;
     }
 
-    fp = (struct file *)host->priv;
+    uartpriv = (struct UartPriv *)host->priv;
+    fp = uartpriv->fp;
     oldfs = get_fs();
     set_fs(KERNEL_DS);
     ret = vfs_write(fp, p, size, &pos);
@@ -210,12 +221,14 @@ static int32_t UartAdapterGetBaud(struct UartHost *host, uint32_t *baudRate)
 {
     struct termios termios;
     struct file *fp = NULL;
+    struct UartPriv *uartpriv = NULL;
 
     if (host == NULL) {
         HDF_LOGE("UartAdapterGetBaud: host is null!");
         return HDF_ERR_INVALID_OBJECT;
     }
-    fp = (struct file *)host->priv;
+    uartpriv = (struct UartPriv *)host->priv;
+    fp = uartpriv->fp;
     if (baudRate == NULL) {
         HDF_LOGE("UartAdapterGetBaud: baudRate is null!");
         return HDF_ERR_INVALID_PARAM;
@@ -283,13 +296,15 @@ static int32_t UartAdapterSetBaud(struct UartHost *host, uint32_t baudRate)
     struct termios termios;
     struct serial_struct serial;
     struct file *fp = NULL;
+    struct UartPriv *uartpriv = NULL;
     int ret;
 
     if (host == NULL) {
         HDF_LOGE("UartAdapterSetBaud: host is null!");
         return HDF_ERR_INVALID_OBJECT;
     }
-    fp = (struct file *)host->priv;
+    uartpriv = (struct UartPriv *)host->priv;
+    fp = uartpriv->fp;
 
     if (UartAdapterIoctlInner(fp, TCGETS, (unsigned long)&termios) < 0) {
         HDF_LOGE("UartAdapterSetBaud: tcgets fail!");
@@ -381,13 +396,15 @@ static int32_t UartAdapterGetAttribute(struct UartHost *host, struct UartAttribu
 {
     struct termios termios;
     struct file *fp = NULL;
+    struct UartPriv *uartpriv = NULL;
     int ret;
 
     if (host == NULL) {
         HDF_LOGE("UartAdapterGetAttribute: host is null!");
         return HDF_ERR_INVALID_OBJECT;
     }
-    fp = (struct file *)host->priv;
+    uartpriv = (struct UartPriv *)host->priv;
+    fp = uartpriv->fp;
     if (attribute == NULL) {
         HDF_LOGE("UartAdapterGetAttribute: attribute is null!");
         return HDF_ERR_INVALID_PARAM;
@@ -409,13 +426,15 @@ static int32_t UartAdapterSetAttribute(struct UartHost *host, struct UartAttribu
 {
     struct termios termios;
     struct file *fp = NULL;
+    struct UartPriv *uartpriv = NULL;
     int ret;
 
     if (host == NULL) {
         HDF_LOGE("UartAdapterSetAttribute: host is null!");
         return HDF_ERR_INVALID_OBJECT;
     }
-    fp = (struct file *)host->priv;
+    uartpriv = (struct UartPriv *)host->priv;
+    fp = uartpriv->fp;
     if (attribute == NULL) {
         HDF_LOGE("UartAdapterSetAttribute: attribute is null!");
         return HDF_ERR_INVALID_PARAM;
@@ -485,6 +504,7 @@ static int32_t HdfUartInit(struct HdfDeviceObject *obj)
     struct DeviceResourceIface *iface = NULL;
     struct UartHost *host = NULL;
     const char *drName = NULL;
+    struct UartPriv *uartpriv;
 
     HDF_LOGI("HdfUartInit: entry!");
     if (obj == NULL) {
@@ -510,17 +530,25 @@ static int32_t HdfUartInit(struct HdfDeviceObject *obj)
         HDF_LOGE("HdfUartInit: read driver_name fail!");
         return HDF_FAILURE;
     }
-    g_driverName[UART_NAME_LEN - 1] = 0;
+
     if (strlen(drName) > (UART_NAME_LEN - 1)) {
         HDF_LOGE("HdfUartInit: illegal length of drName!");
         return HDF_FAILURE;
     }
-    ret = memcpy_s(g_driverName, UART_NAME_LEN, drName, strlen(drName));
-    if (ret != EOK) {
-        HDF_LOGE("HdfUartInit: memcpy_s fail!");
+    
+    uartpriv = OsalMemCalloc(sizeof(struct UartPriv));
+    if (uartpriv == NULL) {
+        HDF_LOGE("HdfUartInit: malloc UartPriv fail!");
+        return HDF_FAILURE;
+    }
+    
+    if(memcpy_s(uartpriv->g_driverName, UART_NAME_LEN, drName, strlen(drName)) < 0) {
+        HDF_LOGE("HdfUartInit: memcpy_s drName fail!");
         return HDF_FAILURE;
     }
+    
     host->method = &g_uartHostMethod;
+    host->priv = uartpriv;
     return HDF_SUCCESS;
 }
 
@@ -534,6 +562,7 @@ static void HdfUartRelease(struct HdfDeviceObject *obj)
         return;
     }
     host = UartHostFromDevice(obj);
+    OsalMemFree(host->priv);
     UartHostDestroy(host);
 }
 
-- 
Gitee


From 15ed02edad766a1574f783198a2c88fa470d6afe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=98=E6=99=A8=E9=98=B3?= <690928667@qq.com>
Date: Fri, 28 Jun 2024 05:30:10 +0000
Subject: [PATCH 2/9] =?UTF-8?q?update=20adapter/khdf/linux/platform/uart/u?=
 =?UTF-8?q?art=5Fadapter.c.=20Signed-off-by:=20=E4=BB=98=E6=B8=85=E9=91=AB?=
 =?UTF-8?q?=20<690928667@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 付晨阳 <690928667@qq.com>
---
 adapter/khdf/linux/platform/uart/uart_adapter.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/adapter/khdf/linux/platform/uart/uart_adapter.c b/adapter/khdf/linux/platform/uart/uart_adapter.c
index 62062327f..473429a1c 100644
--- a/adapter/khdf/linux/platform/uart/uart_adapter.c
+++ b/adapter/khdf/linux/platform/uart/uart_adapter.c
@@ -34,7 +34,6 @@
 #define UART_NAME_LEN 20
 #define UART_PATHNAME_LEN (UART_NAME_LEN + 20)
 
-//static char g_driverName[UART_NAME_LEN];
 struct UartPriv{
     struct file *fp;
     char   g_driverName[UART_NAME_LEN];
-- 
Gitee


From 687498fe38a88c2679f81325bd5c2d39e2562a11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=98=E6=99=A8=E9=98=B3?= <690928667@qq.com>
Date: Fri, 28 Jun 2024 06:22:18 +0000
Subject: [PATCH 3/9] =?UTF-8?q?update=20adapter/khdf/linux/platform/uart/u?=
 =?UTF-8?q?art=5Fadapter.c.=20Signed-off-by:=20=E4=BB=98=E6=B8=85=E9=91=AB?=
 =?UTF-8?q?=20<690928667@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 付晨阳 <690928667@qq.com>
---
 adapter/khdf/linux/platform/uart/uart_adapter.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/adapter/khdf/linux/platform/uart/uart_adapter.c b/adapter/khdf/linux/platform/uart/uart_adapter.c
index 473429a1c..37bd71052 100644
--- a/adapter/khdf/linux/platform/uart/uart_adapter.c
+++ b/adapter/khdf/linux/platform/uart/uart_adapter.c
@@ -34,10 +34,11 @@
 #define UART_NAME_LEN 20
 #define UART_PATHNAME_LEN (UART_NAME_LEN + 20)
 
-struct UartPriv{
+typedef struct {
     struct file *fp;
     char   g_driverName[UART_NAME_LEN];
-};
+} UartPriv;
+
 static int32_t UartAdapterInit(struct UartHost *host)
 {
     char name[UART_PATHNAME_LEN] = {0};
@@ -541,7 +542,7 @@ static int32_t HdfUartInit(struct HdfDeviceObject *obj)
         return HDF_FAILURE;
     }
     
-    if(memcpy_s(uartpriv->g_driverName, UART_NAME_LEN, drName, strlen(drName)) < 0) {
+    if (memcpy_s(uartpriv->g_driverName, UART_NAME_LEN, drName, strlen(drName)) < 0) {
         HDF_LOGE("HdfUartInit: memcpy_s drName fail!");
         return HDF_FAILURE;
     }
-- 
Gitee


From 4043839e1fda05bd59866f16baaa3c4f5219cb99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=98=E6=99=A8=E9=98=B3?= <690928667@qq.com>
Date: Fri, 28 Jun 2024 07:09:04 +0000
Subject: [PATCH 4/9] =?UTF-8?q?update=20adapter/khdf/linux/platform/uart/u?=
 =?UTF-8?q?art=5Fadapter.c.=20Signed-off-by:=20=E4=BB=98=E6=B8=85=E9=91=AB?=
 =?UTF-8?q?=20<690928667@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 付晨阳 <690928667@qq.com>
---
 adapter/khdf/linux/platform/uart/uart_adapter.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/adapter/khdf/linux/platform/uart/uart_adapter.c b/adapter/khdf/linux/platform/uart/uart_adapter.c
index 37bd71052..2eca53570 100644
--- a/adapter/khdf/linux/platform/uart/uart_adapter.c
+++ b/adapter/khdf/linux/platform/uart/uart_adapter.c
@@ -36,7 +36,7 @@
 
 typedef struct {
     struct file *fp;
-    char   g_driverName[UART_NAME_LEN];
+    char   driverName[UART_NAME_LEN];
 } UartPriv;
 
 static int32_t UartAdapterInit(struct UartHost *host)
@@ -51,7 +51,7 @@ static int32_t UartAdapterInit(struct UartHost *host)
         return HDF_ERR_INVALID_OBJECT;
     }
     uartpriv = (struct UartPriv *)host->priv;
-    if (sprintf_s(name, UART_PATHNAME_LEN - 1, "/dev/%s%d", uartpriv->g_driverName, host->num) < 0) {
+    if (sprintf_s(name, UART_PATHNAME_LEN - 1, "/dev/%s%d", uartpriv->driverName, host->num) < 0) {
         return HDF_FAILURE;
     }
     oldfs = get_fs();
@@ -542,7 +542,7 @@ static int32_t HdfUartInit(struct HdfDeviceObject *obj)
         return HDF_FAILURE;
     }
     
-    if (memcpy_s(uartpriv->g_driverName, UART_NAME_LEN, drName, strlen(drName)) < 0) {
+    if (memcpy_s(uartpriv->driverName, UART_NAME_LEN, drName, strlen(drName)) < 0) {
         HDF_LOGE("HdfUartInit: memcpy_s drName fail!");
         return HDF_FAILURE;
     }
-- 
Gitee


From 7b632003d3e16559496bd27119d5aa04c2a22878 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=98=E6=99=A8=E9=98=B3?= <690928667@qq.com>
Date: Fri, 28 Jun 2024 07:45:47 +0000
Subject: [PATCH 5/9] =?UTF-8?q?update=20adapter/khdf/linux/platform/uart/u?=
 =?UTF-8?q?art=5Fadapter.c.=20Signed-off-by:=20=E4=BB=98=E6=99=A8=E9=98=B3?=
 =?UTF-8?q?=20<690928667@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 付晨阳 <690928667@qq.com>
---
 .../khdf/linux/platform/uart/uart_adapter.c   | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/adapter/khdf/linux/platform/uart/uart_adapter.c b/adapter/khdf/linux/platform/uart/uart_adapter.c
index 2eca53570..6f23ecf76 100644
--- a/adapter/khdf/linux/platform/uart/uart_adapter.c
+++ b/adapter/khdf/linux/platform/uart/uart_adapter.c
@@ -35,7 +35,7 @@
 #define UART_PATHNAME_LEN (UART_NAME_LEN + 20)
 
 typedef struct {
-    struct file *fp;
+    struct file *fiLp;
     char   driverName[UART_NAME_LEN];
 } UartPriv;
 
@@ -63,7 +63,7 @@ static int32_t UartAdapterInit(struct UartHost *host)
         return HDF_FAILURE;
     }
     set_fs(oldfs);
-    host->priv = fp;
+    uartpriv->fiLp = fp;
     return HDF_SUCCESS;
 }
 
@@ -78,14 +78,14 @@ static int32_t UartAdapterDeInit(struct UartHost *host)
         return HDF_ERR_INVALID_OBJECT;
     }
     uartpriv = (struct UartPriv *)host->priv;
-    fp = uartpriv->fp;
+    fp = uartpriv->fiLp;
     oldfs = get_fs();
     set_fs(KERNEL_DS);
     if (!IS_ERR(fp) && fp) {
         filp_close(fp, NULL);
     }
     set_fs(oldfs);
-    uartpriv->fp = NULL;
+    uartpriv->fiLp = NULL;
     return HDF_SUCCESS;
 }
 
@@ -105,7 +105,7 @@ static int32_t UartAdapterRead(struct UartHost *host, uint8_t *data, uint32_t si
     }
 
     uartpriv = (struct UartPriv *)host->priv;
-    fp = uartpriv->fp;
+    fp = uartpriv->fiLp;
     oldfs = get_fs();
     set_fs(KERNEL_DS);
     while (size >= tmp) {
@@ -135,7 +135,7 @@ static int32_t UartAdapterWrite(struct UartHost *host, uint8_t *data, uint32_t s
     }
 
     uartpriv = (struct UartPriv *)host->priv;
-    fp = uartpriv->fp;
+    fp = uartpriv->fiLp;
     oldfs = get_fs();
     set_fs(KERNEL_DS);
     ret = vfs_write(fp, p, size, &pos);
@@ -228,7 +228,7 @@ static int32_t UartAdapterGetBaud(struct UartHost *host, uint32_t *baudRate)
         return HDF_ERR_INVALID_OBJECT;
     }
     uartpriv = (struct UartPriv *)host->priv;
-    fp = uartpriv->fp;
+    fp = uartpriv->fiLp;
     if (baudRate == NULL) {
         HDF_LOGE("UartAdapterGetBaud: baudRate is null!");
         return HDF_ERR_INVALID_PARAM;
@@ -304,7 +304,7 @@ static int32_t UartAdapterSetBaud(struct UartHost *host, uint32_t baudRate)
         return HDF_ERR_INVALID_OBJECT;
     }
     uartpriv = (struct UartPriv *)host->priv;
-    fp = uartpriv->fp;
+    fp = uartpriv->fiLp;
 
     if (UartAdapterIoctlInner(fp, TCGETS, (unsigned long)&termios) < 0) {
         HDF_LOGE("UartAdapterSetBaud: tcgets fail!");
@@ -404,7 +404,7 @@ static int32_t UartAdapterGetAttribute(struct UartHost *host, struct UartAttribu
         return HDF_ERR_INVALID_OBJECT;
     }
     uartpriv = (struct UartPriv *)host->priv;
-    fp = uartpriv->fp;
+    fp = uartpriv->fiLp;
     if (attribute == NULL) {
         HDF_LOGE("UartAdapterGetAttribute: attribute is null!");
         return HDF_ERR_INVALID_PARAM;
@@ -434,7 +434,7 @@ static int32_t UartAdapterSetAttribute(struct UartHost *host, struct UartAttribu
         return HDF_ERR_INVALID_OBJECT;
     }
     uartpriv = (struct UartPriv *)host->priv;
-    fp = uartpriv->fp;
+    fp = uartpriv->fiLp;
     if (attribute == NULL) {
         HDF_LOGE("UartAdapterSetAttribute: attribute is null!");
         return HDF_ERR_INVALID_PARAM;
-- 
Gitee


From af5d3f8c16f43fcdbaca6c4dabfc94c50eddbede Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=98=E6=99=A8=E9=98=B3?= <690928667@qq.com>
Date: Fri, 28 Jun 2024 08:39:52 +0000
Subject: [PATCH 6/9] =?UTF-8?q?update=20adapter/khdf/linux/platform/uart/u?=
 =?UTF-8?q?art=5Fadapter.c.=20Signed-off-by:=20=E4=BB=98=E6=99=A8=E9=98=B3?=
 =?UTF-8?q?=20<690928667@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 付晨阳 <690928667@qq.com>
---
 .../khdf/linux/platform/uart/uart_adapter.c   | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/adapter/khdf/linux/platform/uart/uart_adapter.c b/adapter/khdf/linux/platform/uart/uart_adapter.c
index 6f23ecf76..01ed6af21 100644
--- a/adapter/khdf/linux/platform/uart/uart_adapter.c
+++ b/adapter/khdf/linux/platform/uart/uart_adapter.c
@@ -35,7 +35,7 @@
 #define UART_PATHNAME_LEN (UART_NAME_LEN + 20)
 
 typedef struct {
-    struct file *fiLp;
+    struct file *fileFp;
     char   driverName[UART_NAME_LEN];
 } UartPriv;
 
@@ -63,7 +63,7 @@ static int32_t UartAdapterInit(struct UartHost *host)
         return HDF_FAILURE;
     }
     set_fs(oldfs);
-    uartpriv->fiLp = fp;
+    uartpriv->fileFp = fp;
     return HDF_SUCCESS;
 }
 
@@ -78,14 +78,14 @@ static int32_t UartAdapterDeInit(struct UartHost *host)
         return HDF_ERR_INVALID_OBJECT;
     }
     uartpriv = (struct UartPriv *)host->priv;
-    fp = uartpriv->fiLp;
+    fp = uartpriv->fileFp;
     oldfs = get_fs();
     set_fs(KERNEL_DS);
     if (!IS_ERR(fp) && fp) {
         filp_close(fp, NULL);
     }
     set_fs(oldfs);
-    uartpriv->fiLp = NULL;
+    uartpriv->fileFp = NULL;
     return HDF_SUCCESS;
 }
 
@@ -105,7 +105,7 @@ static int32_t UartAdapterRead(struct UartHost *host, uint8_t *data, uint32_t si
     }
 
     uartpriv = (struct UartPriv *)host->priv;
-    fp = uartpriv->fiLp;
+    fp = uartpriv->fileFp;
     oldfs = get_fs();
     set_fs(KERNEL_DS);
     while (size >= tmp) {
@@ -135,7 +135,7 @@ static int32_t UartAdapterWrite(struct UartHost *host, uint8_t *data, uint32_t s
     }
 
     uartpriv = (struct UartPriv *)host->priv;
-    fp = uartpriv->fiLp;
+    fp = uartpriv->fileFp;
     oldfs = get_fs();
     set_fs(KERNEL_DS);
     ret = vfs_write(fp, p, size, &pos);
@@ -228,7 +228,7 @@ static int32_t UartAdapterGetBaud(struct UartHost *host, uint32_t *baudRate)
         return HDF_ERR_INVALID_OBJECT;
     }
     uartpriv = (struct UartPriv *)host->priv;
-    fp = uartpriv->fiLp;
+    fp = uartpriv->fileFp;
     if (baudRate == NULL) {
         HDF_LOGE("UartAdapterGetBaud: baudRate is null!");
         return HDF_ERR_INVALID_PARAM;
@@ -304,7 +304,7 @@ static int32_t UartAdapterSetBaud(struct UartHost *host, uint32_t baudRate)
         return HDF_ERR_INVALID_OBJECT;
     }
     uartpriv = (struct UartPriv *)host->priv;
-    fp = uartpriv->fiLp;
+    fp = uartpriv->fileFp;
 
     if (UartAdapterIoctlInner(fp, TCGETS, (unsigned long)&termios) < 0) {
         HDF_LOGE("UartAdapterSetBaud: tcgets fail!");
@@ -404,7 +404,7 @@ static int32_t UartAdapterGetAttribute(struct UartHost *host, struct UartAttribu
         return HDF_ERR_INVALID_OBJECT;
     }
     uartpriv = (struct UartPriv *)host->priv;
-    fp = uartpriv->fiLp;
+    fp = uartpriv->fileFp;
     if (attribute == NULL) {
         HDF_LOGE("UartAdapterGetAttribute: attribute is null!");
         return HDF_ERR_INVALID_PARAM;
@@ -434,7 +434,7 @@ static int32_t UartAdapterSetAttribute(struct UartHost *host, struct UartAttribu
         return HDF_ERR_INVALID_OBJECT;
     }
     uartpriv = (struct UartPriv *)host->priv;
-    fp = uartpriv->fiLp;
+    fp = uartpriv->fileFp;
     if (attribute == NULL) {
         HDF_LOGE("UartAdapterSetAttribute: attribute is null!");
         return HDF_ERR_INVALID_PARAM;
-- 
Gitee


From ad23cd07166e8bcb68e2b905244fd9df0618f2ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=98=E6=99=A8=E9=98=B3?= <690928667@qq.com>
Date: Fri, 28 Jun 2024 09:47:47 +0000
Subject: [PATCH 7/9] add adapter/khdf/linux/platform/uart/.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 付晨阳 <690928667@qq.com>
---
 adapter/khdf/linux/platform/uart/uart_adapter.h | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 adapter/khdf/linux/platform/uart/uart_adapter.h

diff --git a/adapter/khdf/linux/platform/uart/uart_adapter.h b/adapter/khdf/linux/platform/uart/uart_adapter.h
new file mode 100644
index 000000000..e69de29bb
-- 
Gitee


From 80d1c21471f79c0f473936cb0cd249fd61d9bf35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=98=E6=99=A8=E9=98=B3?= <690928667@qq.com>
Date: Fri, 28 Jun 2024 09:51:59 +0000
Subject: [PATCH 8/9] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20adap?=
 =?UTF-8?q?ter/khdf/linux/platform/uart/uart=5Fadapter.h?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adapter/khdf/linux/platform/uart/uart_adapter.h | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 adapter/khdf/linux/platform/uart/uart_adapter.h

diff --git a/adapter/khdf/linux/platform/uart/uart_adapter.h b/adapter/khdf/linux/platform/uart/uart_adapter.h
deleted file mode 100644
index e69de29bb..000000000
-- 
Gitee


From 889e2427932a0f9540843369ce14b430c9aae71b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=98=E6=99=A8=E9=98=B3?= <690928667@qq.com>
Date: Fri, 28 Jun 2024 09:52:37 +0000
Subject: [PATCH 9/9] =?UTF-8?q?update=20adapter/khdf/linux/platform/uart/u?=
 =?UTF-8?q?art=5Fadapter.c.=20Signed-off-by:=20=E4=BB=98=E6=99=A8=E9=98=B3?=
 =?UTF-8?q?=20<690928667@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 付晨阳 <690928667@qq.com>
---
 adapter/khdf/linux/platform/uart/uart_adapter.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/adapter/khdf/linux/platform/uart/uart_adapter.c b/adapter/khdf/linux/platform/uart/uart_adapter.c
index 01ed6af21..bba32be39 100644
--- a/adapter/khdf/linux/platform/uart/uart_adapter.c
+++ b/adapter/khdf/linux/platform/uart/uart_adapter.c
@@ -34,7 +34,7 @@
 #define UART_NAME_LEN 20
 #define UART_PATHNAME_LEN (UART_NAME_LEN + 20)
 
-typedef struct {
+extern typedef struct {
     struct file *fileFp;
     char   driverName[UART_NAME_LEN];
 } UartPriv;
-- 
Gitee