diff --git a/app/include/pd_dau.h b/app/include/pd_dau.h index 98421be..d7ce4fa 100755 --- a/app/include/pd_dau.h +++ b/app/include/pd_dau.h @@ -53,7 +53,6 @@ /* Exported types ------------------------------------------------------------*/ typedef int32_t (*dau_recv_cb)(uint8_t, char*, uint16_t); typedef int32_t (*dau_send_cb)(uint8_t, uint8_t, void*); -typedef void (*dau_data_free_cb)(uint8_t); typedef void (*dau_show_cfg_cb)(uint8_t); typedef void (*dau_show_port_cb)(uint8_t, uint8_t); @@ -200,7 +199,6 @@ typedef struct dau_state_t state; // dau 状态 dau_recv_cb recv_cb; // dau 收包处理函数 dau_send_cb send_cb; // dau 收包处理函数 - dau_data_free_cb free_cb; // 内存释放函数 dau_show_cfg_cb show_cfg_cb; // 显示全局配置函数 dau_show_port_cb show_port_cb; // 显示端口配置函数 int32_t fifo_send; // 发包 fifo diff --git a/app/include/pd_hf.h b/app/include/pd_hf.h index e3974e5..940cce5 100755 --- a/app/include/pd_hf.h +++ b/app/include/pd_hf.h @@ -325,8 +325,7 @@ typedef struct /* Extern functions ----------------------------------------------------------*/ extern int32_t hf_recv_process(uint8_t slot, char *pkt, uint16_t len); extern int32_t hf_send_process(uint8_t slot, uint8_t type, void *data); -extern void* hf_data_malloc(void); -extern void hf_data_free(uint8_t slot); +extern void* hf_data_malloc(uint8_t slot); extern void hf_show_cfg(uint8_t slot); extern void hf_show_port(uint8_t slot, uint8_t port); #endif diff --git a/app/lib/a_process/pd_dau.c b/app/lib/a_process/pd_dau.c index 97f3f4f..1a64f4e 100755 --- a/app/lib/a_process/pd_dau.c +++ b/app/lib/a_process/pd_dau.c @@ -237,15 +237,9 @@ int _dau_insert(dau_t *dau) { if (3 == dau->info.type_m && 1 == dau->info.type_s) { - /* 申请和释放放在一起, 避免地址失效 */ - if (dau->private_data && dau->free_cb) - { - dau->free_cb(dau->slot); - } - dau->private_data = hf_data_malloc(); + hf_data_malloc(dau->slot); dau->recv_cb = hf_recv_process; dau->send_cb = hf_send_process; - dau->free_cb = hf_data_free; dau->show_cfg_cb = hf_show_cfg; dau->show_port_cb = hf_show_port; } diff --git a/app/lib/a_process/pd_hf.c b/app/lib/a_process/pd_hf.c index cf5b723..d7350d3 100755 --- a/app/lib/a_process/pd_hf.c +++ b/app/lib/a_process/pd_hf.c @@ -564,7 +564,7 @@ void _hf_recv_prps(uint8_t slot, char *pkt, uint16_t len) { dau_t *dau = &daus[slot]; hf_data_t *hf_data = (hf_data_t*)dau->private_data; - hf_prps_t prps = hf_data->prps; + hf_prps_t *prps = &hf_data->prps; hf_prps_t *prps_send = NULL; hf_prps_head_t *head_prps = (hf_prps_head_t*)(pkt + sizeof(dau_pkt_head_t)); char *data = (char*)(pkt + sizeof(dau_pkt_head_t) + sizeof(hf_prps_head_t)); @@ -573,10 +573,10 @@ void _hf_recv_prps(uint8_t slot, char *pkt, uint16_t len) /* 第一个报文 */ if (0 == head_prps->pkt_index) { - memcpy(&prps.head, head_prps, sizeof(hf_prps_head_t)); + memcpy(&prps->head, head_prps, sizeof(hf_prps_head_t)); } - point = (char*)prps.prps; + point = (char*)prps->prps; point += head_prps->pkt_index * HF_DATA_LEN; memcpy(point, data, head_prps->len); @@ -590,7 +590,7 @@ void _hf_recv_prps(uint8_t slot, char *pkt, uint16_t len) return; } - memcpy(prps_send, &prps, sizeof(hf_prps_t)); + memcpy(prps_send, prps, sizeof(hf_prps_t)); /* 发送给后台, 内存由后台释放 */ if (dau_msg_send(DAU_SEND_PRPS, slot, prps_send) != E_NONE) @@ -795,31 +795,32 @@ int32_t hf_send_process(uint8_t slot, uint8_t type, void *data) } /* 高频私有数据 */ -void* hf_data_malloc(void) +void* hf_data_malloc(uint8_t slot) { - hf_data_t *p = XMALLOC_Q(MTYPE_HF, sizeof(hf_data_t)); - if (!p) + dau_t *dau = &daus[slot]; + hf_data_t *p = (hf_data_t*)dau->private_data; + + /* 申请新内存 */ + dau->private_data = XMALLOC_Q(MTYPE_HF, sizeof(hf_data_t)); + if (!dau->private_data) { DBG(DBG_M_PD_HF_ERR, "XMALLOC ERROR!\r\n"); return NULL; } + /* 释放旧内存 */ + if (p) + { + XFREE(MTYPE_HF, p); + } + + p = (hf_data_t*)dau->private_data; memset(&p->cfg, 0, sizeof(hf_cfg_t)); memset(&p->port, 0, sizeof(hf_cfg_port_t) * PD_DAU_PORT_SUM); return p; } -/* 高频私有数据释放 */ -void hf_data_free(uint8_t slot) -{ - hf_data_t *hf_data = (hf_data_t*)daus[slot].private_data; - - XFREE(MTYPE_HF, hf_data); - - return; -} - /* 显示全局配置 */ void hf_show_cfg(uint8_t slot) {