修改部分osal_kmalloc 为malloc，优化272 lcd tp上下电 降低功耗

diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py
index ad28455..2d342f6 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/config.py
+++ b/code/sdk/build/config/target_config/brandy/config.py
@@ -1160,6 +1160,7 @@ target = {
             # 'DOWNLOAD_GNSS_SWITCH',
             'PPG_HX3695',
             'ROTARYENCODER_HX3508',
+            '-:SUPPORT_ALIPAY_SEC',
         ],
         #添加自定义应用
        'ram_component': [

diff --git a/code/sdk/drivers/boards/brandy_evb/board_config/board_fd272.h b/code/sdk/drivers/boards/brandy_evb/board_config/board_fd272.h
index cdca2bf..c67c325 100644 (file)
--- a/code/sdk/drivers/boards/brandy_evb/board_config/board_fd272.h
+++ b/code/sdk/drivers/boards/brandy_evb/board_config/board_fd272.h
@@ -177,8 +177,8 @@ const hal_pio_config_t g_pio_function_config[PIN_MAX_NUMBER] = {
 #endif
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_UP, HAL_PIO_IE_ENBALE },    // S_AGPIO_L11 G_INT1
 
-    { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_ENBALE },    // S_AGPIO_L12 i2c data HX3507_SDIO
-    { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_DISABLE },   // S_AGPIO_L13 i2c CLK HX3507_SCLK
+    { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_DOWN, HAL_PIO_IE_DISABLE },    // S_AGPIO_L12 i2c data HX3507_SDIO
+    { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_DOWN, HAL_PIO_IE_DISABLE },   // S_AGPIO_L13 i2c CLK HX3507_SCLK
 
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_DOWN, HAL_PIO_IE_DISABLE }, // S_AGPIO_L14   NC
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_DOWN, HAL_PIO_IE_DISABLE }, // S_AGPIO_L15   NC
@@ -189,19 +189,19 @@ const hal_pio_config_t g_pio_function_config[PIN_MAX_NUMBER] = {
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_UP, HAL_PIO_IE_DISABLE },  // S_AGPIO_L19  G_INT2  //暂时不用 
 
 
-    { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_UP, HAL_PIO_IE_DISABLE }, // S_AGPIO_L20  0.2C_CHRG
+    { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_DOWN, HAL_PIO_IE_DISABLE }, // S_AGPIO_L20  0.2C_CHRG
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_DISABLE },    // S_AGPIO_L21  NTC_VDD_ON给低打开 NTC上拉电源
 #ifdef QSPI_DISPLAY
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_ENBALE },    // S_AGPIO_L22 QSPI TE
 #else
     { HAL_PIO_FUNC_TE, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_ENBALE },      // S_AGPIO_L22 MIPI TE
 #endif
-    { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_DISABLE },   // S_AGPIO_L23 CAT_1_PWR_ON 控制CAT_1开机脚，或者控制 CAT1电源   拉高有效
+    { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_DOWN, HAL_PIO_IE_DISABLE },   // S_AGPIO_L23 CAT_1_PWR_ON 控制CAT_1开机脚，或者控制 CAT1电源   拉高有效
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_DISABLE },   // S_AGPIO_L24 LCM_EN
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_DISABLE },   // S_AGPIO_L25  //////////// audio pa reset
-    { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_DISABLE },   // S_AGPIO_L26 心率复位 PPG reset
+    { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_DOWN, HAL_PIO_IE_DISABLE },   // S_AGPIO_L26 心率复位 PPG reset
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_DISABLE },   // S_AGPIO_L27    LCM reset
-    { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_DISABLE },   // S_AGPIO_L28    CAT_1复位 CAT1_RESET_N  拉低有效
+    { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_DOWN, HAL_PIO_IE_DISABLE },   // S_AGPIO_L28    CAT_1复位 CAT1_RESET_N  拉低有效
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_ENBALE },   // S_AGPIO_L29    charge done info 检测是否充满电
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_DISABLE },   // S_AGPIO_L30   KP_MKIN1 唤醒 CAT1 ，输出
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_DISABLE },   // S_AGPIO_L31    KP_MKOUIT1 唤醒 蓝牙 ,输入
@@ -230,7 +230,7 @@ const hal_pio_config_t g_pio_function_config[PIN_MAX_NUMBER] = {
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_DISABLE },   // S_AGPIO_R8     GYRO_INT1
 #endif
 
-    { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_DISABLE },   // S_AGPIO_R9     BAT_CHARGE_OFF 关掉充电 温度高的时候
+    { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_DOWN, HAL_PIO_IE_DISABLE },   // S_AGPIO_R9     BAT_CHARGE_OFF 关掉充电 温度高的时候
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_ENBALE },   // S_AGPIO_R10   Key2 ///////////////////HAL_PIO_IE_ENBALE input enable
 
 #if CORE == APPS
@@ -273,6 +273,7 @@ const hal_pio_config_t g_pio_function_config[PIN_MAX_NUMBER] = {
 //需要配置默认输出的，以及需要配置默认输入中断函数的。
 const hal_gpio_config_t g_gpio_function_config[PIN_MAX_NUMBER] = {
 
+#ifdef SUPPORT_CAT1_SERVICE
 #if DEFAULT_POWERON_CAT1
     //    S_AGPIO_L23 CAT_1_PWR_ON ----- high power on
     {   S_AGPIO_L23, HAL_GPIO_DIRECTION_OUTPUT, HAL_GPIO_LEVEL_HIGH, 0, NULL },
@@ -283,18 +284,19 @@ const hal_gpio_config_t g_gpio_function_config[PIN_MAX_NUMBER] = {
     {   S_AGPIO_L23, HAL_GPIO_DIRECTION_OUTPUT, HAL_GPIO_LEVEL_LOW, 0, NULL },
    // S_AGPIO_L28   Cat1 reset  ---- low reset
     {   S_AGPIO_L28, HAL_GPIO_DIRECTION_OUTPUT, HAL_GPIO_LEVEL_LOW, 0, NULL },
+#endif
 #endif
     // S_AGPIO_L17   HX3507_INT 
     // {   S_AGPIO_L17, HAL_GPIO_DIRECTION_INPUT, HAL_GPIO_LEVEL_LOW, 0, NULL },
     // S_AGPIO_L12  SDIO_BT
-    {   S_AGPIO_L12, HAL_GPIO_DIRECTION_OUTPUT, HAL_GPIO_LEVEL_LOW, 0, NULL },
+    // {   S_AGPIO_L12, HAL_GPIO_DIRECTION_OUTPUT, HAL_GPIO_LEVEL_LOW, 0, NULL },
     // S_AGPIO_L13   SCLK_BT
-    {   S_AGPIO_L13, HAL_GPIO_DIRECTION_OUTPUT, HAL_GPIO_LEVEL_LOW, 0, NULL },
+    // {   S_AGPIO_L13, HAL_GPIO_DIRECTION_OUTPUT, HAL_GPIO_LEVEL_LOW, 0, NULL },
 
      // S_AGPIO_L26 心率复位 PPG reset
-    {   S_AGPIO_L26, HAL_GPIO_DIRECTION_OUTPUT, HAL_GPIO_LEVEL_LOW, 0, NULL },
+    // {   S_AGPIO_L26, HAL_GPIO_DIRECTION_OUTPUT, HAL_GPIO_LEVEL_LOW, 0, NULL },
     // S_AGPIO_R0 PRG_LED_POWER ON  心率等电源控制脚
-    {   S_AGPIO_R0, HAL_GPIO_DIRECTION_OUTPUT, HAL_GPIO_LEVEL_LOW, 0, NULL },
+    {   S_AGPIO_R0, HAL_GPIO_DIRECTION_OUTPUT, HAL_GPIO_LEVEL_HIGH, 0, NULL },
 
     //S_AGPIO_L21 NTC_VDD_ON 给低打开 NTC上拉电源 ,默认关闭
     {   S_AGPIO_L21, HAL_GPIO_DIRECTION_OUTPUT, HAL_GPIO_LEVEL_HIGH, 0, NULL },
@@ -304,22 +306,22 @@ const hal_gpio_config_t g_gpio_function_config[PIN_MAX_NUMBER] = {
     {   S_AGPIO_R9, HAL_GPIO_DIRECTION_OUTPUT, HAL_GPIO_LEVEL_LOW, 0, NULL },
     {   S_AGPIO_L20, HAL_GPIO_DIRECTION_OUTPUT, HAL_GPIO_LEVEL_LOW, 0, NULL },
 #else
-    {   S_AGPIO_R9, HAL_GPIO_DIRECTION_OUTPUT, HAL_GPIO_LEVEL_LOW, 0, NULL },
-    {   S_AGPIO_L20, HAL_GPIO_DIRECTION_OUTPUT, HAL_GPIO_LEVEL_HIGH, 0, NULL },
+    // {   S_AGPIO_R9, HAL_GPIO_DIRECTION_OUTPUT, HAL_GPIO_LEVEL_LOW, 0, NULL },
+    // {   S_AGPIO_L20, HAL_GPIO_DIRECTION_OUTPUT, HAL_GPIO_LEVEL_HIGH, 0, NULL },
 #endif
 
 //默认关闭马达
     {   S_AGPIO_L16, HAL_GPIO_DIRECTION_OUTPUT, HAL_GPIO_LEVEL_LOW, 0, NULL },
-//默认开启 EXT LDO V3.0 V1.8
-    // {   S_AGPIO_L18, HAL_GPIO_DIRECTION_OUTPUT, HAL_GPIO_LEVEL_LOW, 0, NULL },
+//默认开启 LCD 3V3 EN
+    {   S_AGPIO_L18, HAL_GPIO_DIRECTION_OUTPUT, HAL_GPIO_LEVEL_HIGH, 0, NULL },
 
 #ifdef SUPPORT_CYWEE_SERVICE
     /**G sensor G_INT1 S_AGPIO_L11 G_INT2 S_AGPIO_L19   采用timer 时这些中断要屏蔽*/
     {   S_AGPIO_L11, HAL_GPIO_DIRECTION_INPUT, NULL, GPIO_INTERRUPT_RISING_EDGE, cywee_int_callback },
     //{   S_AGPIO_L19, HAL_GPIO_DIRECTION_INPUT, NULL, GPIO_INTERRUPT_DEDGE, cywee_int_callback },
 #endif    
-    /**S_AGPIO_R1 GPO alipay默认resetpin*/
-    {   S_AGPIO_R1, HAL_GPIO_DIRECTION_OUTPUT, HAL_GPIO_LEVEL_HIGH, 0, NULL },
+    /**S_AGPIO_L4 GPO alipay默认resetpin*/
+    {   S_AGPIO_L4, HAL_GPIO_DIRECTION_OUTPUT, HAL_GPIO_LEVEL_HIGH, 0, NULL },
 #ifdef SUPPORT_CAT1_SERVICE
     /**cat1 ring input key*/
     // {   S_AGPIO_L31, HAL_GPIO_DIRECTION_INPUT, NULL, GPIO_INTERRUPT_DEDGE,  cat1_ring_isr_callback},

diff --git a/code/sdk/drivers/drivers/driver/lcd/lcd_private.c b/code/sdk/drivers/drivers/driver/lcd/lcd_private.c
index c6ebe9d..2feec82 100644 (file)
--- a/code/sdk/drivers/drivers/driver/lcd/lcd_private.c
+++ b/code/sdk/drivers/drivers/driver/lcd/lcd_private.c
@@ -2,7 +2,7 @@
  * @Author: penglei 1624952103@qq.com\r
  * @Date: 2025-07-29 09:33:56\r
  * @LastEditors: penglei 1624952103@qq.com\r
- * @LastEditTime: 2025-11-06 16:07:32\r
+ * @LastEditTime: 2025-11-11 16:48:23\r
  * @FilePath: /FD230/code/sdk/drivers/drivers/driver/lcd/lcd_private.c\r
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE\r
  */\r
@@ -23,19 +23,19 @@
 #include "debug_print.h"\r
 #include "pinctrl.h"\r
 \r
-#ifdef BOARD_FD272\r
-#define LCD_VDD_EN  S_AGPIO_L18\r
-#endif\r
+// #ifdef BOARD_FD272\r
+// #define LCD_VDD_EN  S_AGPIO_L18\r
+// #endif\r
 \r
 static void lcd_drv_power_on(void)\r
 {\r
 \r
-#ifdef BOARD_FD272\r
-    uapi_gpio_set_dir(LCD_VDD_EN, GPIO_DIRECTION_OUTPUT);\r
+// #ifdef BOARD_FD272\r
+//     uapi_gpio_set_dir(LCD_VDD_EN, GPIO_DIRECTION_OUTPUT);\r
 \r
-    uapi_gpio_set_val(LCD_VDD_EN, GPIO_LEVEL_HIGH);\r
-    uapi_tcxo_delay_ms(10); /* delay 10 ms */\r
-#endif\r
+//     uapi_gpio_set_val(LCD_VDD_EN, GPIO_LEVEL_HIGH);\r
+//     uapi_tcxo_delay_ms(10); /* delay 10 ms */\r
+// #endif\r
 \r
 #ifndef QSPI_DISPLAY\r
     uapi_gpio_set_dir(VCI_LCD_GPIO, GPIO_DIRECTION_OUTPUT);\r
@@ -78,12 +78,12 @@ static void lcd_drv_power_off(void)
     uapi_tcxo_delay_ms(10); /* delay 10 ms */\r
 #endif\r
 \r
-#ifdef BOARD_FD272\r
-    uapi_gpio_set_dir(LCD_VDD_EN, GPIO_DIRECTION_OUTPUT);\r
+// #ifdef BOARD_FD272\r
+//     uapi_gpio_set_dir(LCD_VDD_EN, GPIO_DIRECTION_OUTPUT);\r
 \r
-    uapi_gpio_set_val(LCD_VDD_EN, GPIO_LEVEL_LOW);\r
-    uapi_tcxo_delay_ms(10); /* delay 10 ms */\r
-#endif\r
+//     uapi_gpio_set_val(LCD_VDD_EN, GPIO_LEVEL_LOW);\r
+//     uapi_tcxo_delay_ms(10); /* delay 10 ms */\r
+// #endif\r
 \r
     int resetvalue = uapi_gpio_get_output_val(RESET_LCD_GPIO);\r
     int lcd_envalue = uapi_gpio_get_output_val(VCI_LCD_GPIO);\r

diff --git a/code/sdk/drivers/drivers/driver/touch/cst86xx_touch/cst86xx_ctrl.c b/code/sdk/drivers/drivers/driver/touch/cst86xx_touch/cst86xx_ctrl.c
index 0c99101..19ee82b 100644 (file)
--- a/code/sdk/drivers/drivers/driver/touch/cst86xx_touch/cst86xx_ctrl.c
+++ b/code/sdk/drivers/drivers/driver/touch/cst86xx_touch/cst86xx_ctrl.c
@@ -215,7 +215,7 @@ ext_errno cst86xx_tp_i2c_data_write(uint16_t reg_addr, uint8_t *data_buf, uint32
 \r
     send_len = data_len + sizeof(uint16_t);\r
 \r
-    write_data = (uint8_t *)osal_kmalloc(send_len, OSAL_GFP_KERNEL);\r
+    write_data = (uint8_t *)malloc(send_len);\r
     if (write_data == NULL) {\r
         tp_err("tp send buff malloc fail!");\r
         return EXT_ERR_MALLOC_FAILURE;\r

diff --git a/code/sdk/drivers/drivers/driver/touch/cst92xx_touch/cst92xx_ctrl.c b/code/sdk/drivers/drivers/driver/touch/cst92xx_touch/cst92xx_ctrl.c
index f792405..0da44bf 100644 (file)
--- a/code/sdk/drivers/drivers/driver/touch/cst92xx_touch/cst92xx_ctrl.c
+++ b/code/sdk/drivers/drivers/driver/touch/cst92xx_touch/cst92xx_ctrl.c
@@ -277,7 +277,7 @@ ext_errno cst92xx_tp_i2c_data_write(uint8_t *data_buf, uint32_t data_len)
 \r
     send_len = data_len;\r
 \r
-    write_data = (uint8_t *)osal_kmalloc(send_len, OSAL_GFP_KERNEL);\r
+    write_data = (uint8_t *)malloc(send_len);\r
     if (write_data == NULL) {\r
         tp_err("tp send buff malloc fail!");\r
         return EXT_ERR_MALLOC_FAILURE;\r

diff --git a/code/sdk/drivers/drivers/driver/touch/cst92xx_touch/cst92xx_drv1.c b/code/sdk/drivers/drivers/driver/touch/cst92xx_touch/cst92xx_drv1.c
index 5e7629d..3dad82a 100644 (file)
--- a/code/sdk/drivers/drivers/driver/touch/cst92xx_touch/cst92xx_drv1.c
+++ b/code/sdk/drivers/drivers/driver/touch/cst92xx_touch/cst92xx_drv1.c
@@ -63,7 +63,7 @@ static ext_errno cst92xx_drv_get_info(uint8_t *data, uint8_t data_len)
 \r
 static ext_errno cst92xx_drv_suspend(void)\r
 {\r
-    return cst92xx_set_workmode(DEEPSLEEP,1);\r
+    return cst92xx_supend();\r
 }\r
 \r
 static ext_errno cst92xx_drv_resume(void)\r
@@ -77,7 +77,7 @@ static ext_errno cst92xx_drv_resume(void)
 \r
 static ext_errno cst92xx_drv_sleep(void)\r
 {\r
-    return cst92xx_set_workmode(DEEPSLEEP,1);\r
+    return cst92xx_supend();\r
 }\r
 \r
 touch_peripheral_api g_cst92xx_api = {\r

diff --git a/code/sdk/drivers/drivers/driver/touch/cst92xx_touch/cst92xx_touch1.c b/code/sdk/drivers/drivers/driver/touch/cst92xx_touch/cst92xx_touch1.c
index fd82f5e..dd0b95c 100644 (file)
--- a/code/sdk/drivers/drivers/driver/touch/cst92xx_touch/cst92xx_touch1.c
+++ b/code/sdk/drivers/drivers/driver/touch/cst92xx_touch/cst92xx_touch1.c
@@ -802,7 +802,7 @@ int cst92xx_set_workmode(uint8_t mode,uint8_t enable)
 \r
 \r
 \r
-static int cst92xx_supend(void)\r
+int cst92xx_supend(void)\r
 {\r
     HYN_ENTER();\r
     cst92xx_set_workmode(DEEPSLEEP,0);\r

diff --git a/code/sdk/drivers/drivers/driver/touch/cst92xx_touch/cst92xx_touch1.h b/code/sdk/drivers/drivers/driver/touch/cst92xx_touch/cst92xx_touch1.h
index c9b9515..2f08898 100644 (file)
--- a/code/sdk/drivers/drivers/driver/touch/cst92xx_touch/cst92xx_touch1.h
+++ b/code/sdk/drivers/drivers/driver/touch/cst92xx_touch/cst92xx_touch1.h
@@ -224,6 +224,7 @@ struct hyn_ts_fuc{
 
 int cst92xx_init(struct hyn_ts_data* ts_data);
 int cst92xx_set_workmode(uint8_t mode,uint8_t enable);
+int cst92xx_supend(void);
 
 void cst92xx_get_chip_id(uint16_t *chip_id);
 //ic type

diff --git a/code/sdk/drivers/drivers/driver/touch/ft6x46_touch/ft6x46_ctrl.c b/code/sdk/drivers/drivers/driver/touch/ft6x46_touch/ft6x46_ctrl.c
index 7a47535..926368a 100644 (file)
--- a/code/sdk/drivers/drivers/driver/touch/ft6x46_touch/ft6x46_ctrl.c
+++ b/code/sdk/drivers/drivers/driver/touch/ft6x46_touch/ft6x46_ctrl.c
@@ -227,7 +227,7 @@ ext_errno tp_i2c_data_write(uint8_t reg_addr, uint8_t *data_buf, uint16_t data_l
 
     send_len = data_len + sizeof(uint8_t);
 
-    write_data = (uint8_t *)osal_kmalloc(send_len, OSAL_GFP_KERNEL);
+    write_data = (uint8_t *)malloc(send_len);
     if (write_data == NULL) {
         tp_err("tp send buff malloc fail!");
         return EXT_ERR_MALLOC_FAILURE;
@@ -278,7 +278,7 @@ ext_errno tp_ft6x46_i2c_data_write(uint8_t reg_addr, uint8_t *data_buf, uint16_t
 
     send_len = data_len + sizeof(uint8_t);
 
-    write_data = (uint8_t *)osal_kmalloc(send_len, OSAL_GFP_KERNEL);
+    write_data = (uint8_t *)malloc(send_len);
     if (write_data == NULL) {
         tp_err("tp send buff malloc fail!");
         return EXT_ERR_MALLOC_FAILURE;

diff --git a/code/sdk/drivers/drivers/driver/touch/tma525b_touch/tma525b_ctrl.c b/code/sdk/drivers/drivers/driver/touch/tma525b_touch/tma525b_ctrl.c
index ec0bb9a..e869702 100644 (file)
--- a/code/sdk/drivers/drivers/driver/touch/tma525b_touch/tma525b_ctrl.c
+++ b/code/sdk/drivers/drivers/driver/touch/tma525b_touch/tma525b_ctrl.c
@@ -226,7 +226,7 @@ ext_errno tp_i2c_data_write(uint16_t reg_addr, uint8_t *data_buf, uint32_t data_
 \r
     send_len = data_len + sizeof(uint16_t);\r
 \r
-    write_data = (uint8_t *)osal_kmalloc(send_len, OSAL_GFP_KERNEL);\r
+    write_data = (uint8_t *)malloc(send_len);\r
     if (write_data == NULL) {\r
         tp_err("tp send buff malloc fail!");\r
         return EXT_ERR_MALLOC_FAILURE;\r

diff --git a/code/sdk/drivers/drivers/driver/touch/ztw523_touch/ztw523_ctrl.c b/code/sdk/drivers/drivers/driver/touch/ztw523_touch/ztw523_ctrl.c
index 927a5d7..6642881 100644 (file)
--- a/code/sdk/drivers/drivers/driver/touch/ztw523_touch/ztw523_ctrl.c
+++ b/code/sdk/drivers/drivers/driver/touch/ztw523_touch/ztw523_ctrl.c
@@ -221,7 +221,7 @@ ext_errno tp_i2c_data_write(uint16_t reg_addr, uint8_t *data_buf, uint32_t data_
 \r
     send_len = data_len + sizeof(uint16_t);\r
 \r
-    write_data = (uint8_t *)osal_kmalloc(send_len, OSAL_GFP_KERNEL);\r
+    write_data = (uint8_t *)malloc(send_len);\r
     if (write_data == NULL) {\r
         tp_err("tp send buff malloc fail!");\r
         return EXT_ERR_MALLOC_FAILURE;\r

diff --git a/code/sdk/zhihui/drivers/acc/lis2doc_STdC/lis2doc_porting.c b/code/sdk/zhihui/drivers/acc/lis2doc_STdC/lis2doc_porting.c
index 0fc4a8b..516bed8 100644 (file)
--- a/code/sdk/zhihui/drivers/acc/lis2doc_STdC/lis2doc_porting.c
+++ b/code/sdk/zhihui/drivers/acc/lis2doc_STdC/lis2doc_porting.c
@@ -119,7 +119,7 @@ int32_t platform_write(void *handle, uint8_t reg, const uint8_t *bufp,
     
     platform_init();
     send_len = data_len + sizeof(uint8_t);
-    write_data = (uint8_t *)osal_kmalloc(send_len, OSAL_GFP_KERNEL);
+    write_data = (uint8_t *)malloc(send_len);
     if (write_data == NULL) {
         LIS_ERROR("lis2doc send buff malloc fail!");
         return ERRCODE_FAIL;

diff --git a/code/sdk/zhihui/drivers/rotary_encoder/hx3508/hx3508.c b/code/sdk/zhihui/drivers/rotary_encoder/hx3508/hx3508.c
index 490deaf..ed2a2a6 100644 (file)
--- a/code/sdk/zhihui/drivers/rotary_encoder/hx3508/hx3508.c
+++ b/code/sdk/zhihui/drivers/rotary_encoder/hx3508/hx3508.c
@@ -760,7 +760,6 @@ void ots_stop(void)
 #ifdef MOT_NO_USE_MODE
        ots_timer_stop();
        ots_result = 0;
-    ots_timer_stop();
     ots_write_reg(RA_DEBUG_CAS0,0x20); //power down
     //LOS_Mdelay(20);
     TYHX_LOG("[ots_stop]\r\n");

diff --git a/code/sdk/zhihui/drivers/rotary_encoder/rotary_encoder_queue1.c b/code/sdk/zhihui/drivers/rotary_encoder/rotary_encoder_queue1.c
index 4dc7296..7a6d535 100644 (file)
--- a/code/sdk/zhihui/drivers/rotary_encoder/rotary_encoder_queue1.c
+++ b/code/sdk/zhihui/drivers/rotary_encoder/rotary_encoder_queue1.c
@@ -47,7 +47,7 @@ static void re_unlock(void)
 re_queue_t *re_init_queue(uint32_t capacity)
 {
     ext_errno ret;
-    re_queue_t *q = (re_queue_t *)osal_kmalloc(sizeof(re_queue_t), OSAL_GFP_KERNEL);
+    re_queue_t *q = (re_queue_t *)malloc(sizeof(re_queue_t));
     if (q == NULL) {
         return NULL;
     }
@@ -113,11 +113,11 @@ int32_t re_en_queue(re_queue_t *q, re_input_event_info *msg)
         re_de_queue(q, &tmp_msg);
     }
 
-    struct re_list *node = osal_kmalloc(sizeof(struct re_list), OSAL_GFP_KERNEL);
+    struct re_list *node = malloc(sizeof(struct re_list));
     if (node == NULL) {
         return -1;
     }
-    node->msg = (re_input_event_info *)osal_kmalloc(sizeof(re_input_event_info), OSAL_GFP_KERNEL);
+    node->msg = (re_input_event_info *)malloc(sizeof(re_input_event_info));
     if (node->msg == NULL) {
         re_mem_free(node);
         return -1;

diff --git a/code/sdk/zhihui/services/gnss/src/uart_gnss.c b/code/sdk/zhihui/services/gnss/src/uart_gnss.c
index 10ae4b2..57c4264 100644 (file)
--- a/code/sdk/zhihui/services/gnss/src/uart_gnss.c
+++ b/code/sdk/zhihui/services/gnss/src/uart_gnss.c
@@ -52,7 +52,7 @@ void do_gnss_cmd_head(int cmd,uint8_t *buffer,uint32_t size)
     gnss_cmd_t mail = {0};
     if(cmd == GNSS_CMD_READDATA)
     {   //只有接收的缓存需要malloc，发送的都是静态数组，无需申请缓存
-        mail.buffer = osal_kmalloc(size+1, OSAL_GFP_KERNEL);
+        mail.buffer = malloc(size+1);
         if (mail.buffer == NULL) {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"uart message buffer memory alloc fail, length is %d "NEWLINE, size);
             return;
@@ -87,7 +87,7 @@ void do_gnss_cmd(int cmd,uint8_t *buffer,uint32_t size)
     gnss_cmd_t mail = {0};
     if(cmd == GNSS_CMD_READDATA)
     {   //只有接收的缓存需要malloc，发送的都是静态数组，无需申请缓存
-        mail.buffer = osal_kmalloc(size+1, OSAL_GFP_KERNEL);
+        mail.buffer = malloc(size+1);
         if (mail.buffer == NULL) {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"uart message buffer memory alloc fail, length is %d "NEWLINE, size);
             return;

diff --git a/code/sdk/zhihui/utils/custom_cmd_service.c b/code/sdk/zhihui/utils/custom_cmd_service.c
index f3ed372..ed6c1b9 100644 (file)
--- a/code/sdk/zhihui/utils/custom_cmd_service.c
+++ b/code/sdk/zhihui/utils/custom_cmd_service.c
@@ -217,8 +217,9 @@ static void custom_cmd_service_check_task(void const *arg)
             {
 #ifdef SUPPORT_BLE_SERVICE
 #ifdef BLE_INSTRUCT
+#ifdef SUPPORT_ALIPAY_SEC
                 ble_Alipayunbind();
-
+#endif
                 // UnbindSucessCmd(1);//1确认解绑
                 watch_clean_pairs();
 #endif

diff --git a/code/sdk/zhihui/utils/custom_utils.c b/code/sdk/zhihui/utils/custom_utils.c
index 9face26..abe92af 100644 (file)
--- a/code/sdk/zhihui/utils/custom_utils.c
+++ b/code/sdk/zhihui/utils/custom_utils.c
@@ -2691,7 +2691,7 @@ errcode_t custom_i2c_read_regs(uint16_t slaveAddr, uint16_t reg, int regLength,
     uint8_t *write_data = NULL;
     // custom_i2c_init();
 
-    write_data = (uint8_t *)osal_kmalloc(regLength, OSAL_GFP_KERNEL);
+    write_data = (uint8_t *)malloc(regLength);
     if (write_data == NULL) {
         PRINT("send buff malloc fail! %d\n",regLength);
         goto error;
@@ -2753,7 +2753,7 @@ errcode_t custom_i2c_write_reg(uint16_t slaveAddr, uint16_t reg, int regLength,
     
     //custom_i2c_init();
     send_len = data_len + regLength;
-    write_data = (uint8_t *)osal_kmalloc(send_len, OSAL_GFP_KERNEL);
+    write_data = (uint8_t *)malloc(send_len);
     if (write_data == NULL) {
         PRINT("i2cWrite send buff malloc fail %d!\n",send_len);
         goto error;
@@ -2821,7 +2821,7 @@ errcode_t custom_i2c_transfer(uint16_t slaveAddr,uint8_t *writeData, int writeDa
 
     //custom_iic_init();
     write_len = writeDataSize;
-    write_data = (uint8_t *)osal_kmalloc(write_len, OSAL_GFP_KERNEL);
+    write_data = (uint8_t *)malloc(write_len);
     if (write_data == NULL) {
         PRINT(" send buff malloc fail!");
         goto error;

diff --git a/code/sdk/zhihui/utils/custom_utils_at_cmd.c b/code/sdk/zhihui/utils/custom_utils_at_cmd.c
index 3cb8ce0..f10d4c0 100644 (file)
--- a/code/sdk/zhihui/utils/custom_utils_at_cmd.c
+++ b/code/sdk/zhihui/utils/custom_utils_at_cmd.c
@@ -1813,18 +1813,19 @@ static uint32_t custom_enter_factory_test_mode(uint8_t *para, uint32_t paraLen,
     if(cmd == 3)
     {
         custom_get_aging_result();
-    }   
-    else
+    }  
+    else if(cmd == 0)
+    {
+        uapi_restore_factory_setting();
+    }
+    else 
     {
         custom_set_factory_test_flag(cmd);
 
         printf("fac:enter or exit facotry mode :%d\n",cmd);
     }
 
-    if(cmd == 0)
-    {
-        uapi_restore_factory_setting();
-    }
+
     uapi_reboot_device();
 
     return ERRCODE_SUCC;