恢复osal_kmalloc

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 19ee82b..0c99101 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 *)malloc(send_len);\r
+    write_data = (uint8_t *)osal_kmalloc(send_len, OSAL_GFP_KERNEL);\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 0da44bf..f792405 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 *)malloc(send_len);\r
+    write_data = (uint8_t *)osal_kmalloc(send_len, OSAL_GFP_KERNEL);\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/ft6x46_touch/ft6x46_ctrl.c b/code/sdk/drivers/drivers/driver/touch/ft6x46_touch/ft6x46_ctrl.c
index 926368a..7a47535 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 *)malloc(send_len);
+    write_data = (uint8_t *)osal_kmalloc(send_len, OSAL_GFP_KERNEL);
     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 *)malloc(send_len);
+    write_data = (uint8_t *)osal_kmalloc(send_len, OSAL_GFP_KERNEL);
     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 e869702..ec0bb9a 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 *)malloc(send_len);\r
+    write_data = (uint8_t *)osal_kmalloc(send_len, OSAL_GFP_KERNEL);\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 6642881..927a5d7 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 *)malloc(send_len);\r
+    write_data = (uint8_t *)osal_kmalloc(send_len, OSAL_GFP_KERNEL);\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 516bed8..0fc4a8b 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 *)malloc(send_len);
+    write_data = (uint8_t *)osal_kmalloc(send_len, OSAL_GFP_KERNEL);
     if (write_data == NULL) {
         LIS_ERROR("lis2doc send buff malloc fail!");
         return ERRCODE_FAIL;

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 7a6d535..4dc7296 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 *)malloc(sizeof(re_queue_t));
+    re_queue_t *q = (re_queue_t *)osal_kmalloc(sizeof(re_queue_t), OSAL_GFP_KERNEL);
     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 = malloc(sizeof(struct re_list));
+    struct re_list *node = osal_kmalloc(sizeof(struct re_list), OSAL_GFP_KERNEL);
     if (node == NULL) {
         return -1;
     }
-    node->msg = (re_input_event_info *)malloc(sizeof(re_input_event_info));
+    node->msg = (re_input_event_info *)osal_kmalloc(sizeof(re_input_event_info), OSAL_GFP_KERNEL);
     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 57c4264..10ae4b2 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 = malloc(size+1);
+        mail.buffer = osal_kmalloc(size+1, OSAL_GFP_KERNEL);
         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 = malloc(size+1);
+        mail.buffer = osal_kmalloc(size+1, OSAL_GFP_KERNEL);
         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_utils.c b/code/sdk/zhihui/utils/custom_utils.c
index abe92af..9face26 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 *)malloc(regLength);
+    write_data = (uint8_t *)osal_kmalloc(regLength, OSAL_GFP_KERNEL);
     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 *)malloc(send_len);
+    write_data = (uint8_t *)osal_kmalloc(send_len, OSAL_GFP_KERNEL);
     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 *)malloc(write_len);
+    write_data = (uint8_t *)osal_kmalloc(write_len, OSAL_GFP_KERNEL);
     if (write_data == NULL) {
         PRINT(" send buff malloc fail!");
         goto error;