PowLu/TencentOS-tiny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix a bug in tencent_firmware wrapper

Browse Source
This commit is contained in:
mculover666
2020-09-01 15:37:21 +08:00
parent 02d52c6caa
commit 1c0c391ceb
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
devices/esp8266_tencent_firmware/esp8266_tencent_firmware.c
View File

@@ -487,6 +487,8 @@ tencent_firmware_module_t tencent_firmware_module_esp8266 = {
int esp8266_tencent_firmware_sal_init(hal_uart_port_t uart_port) int esp8266_tencent_firmware_sal_init(hal_uart_port_t uart_port)
{ {
int ret = -1;
if (tos_at_init(uart_port, esp8266_tencent_firmware_at_event, if (tos_at_init(uart_port, esp8266_tencent_firmware_at_event,
sizeof(esp8266_tencent_firmware_at_event) / sizeof(esp8266_tencent_firmware_at_event) /
sizeof(esp8266_tencent_firmware_at_event[0])) != 0) { sizeof(esp8266_tencent_firmware_at_event[0])) != 0) {
@@ -497,8 +499,8 @@ int esp8266_tencent_firmware_sal_init(hal_uart_port_t uart_port)
return -1; return -1;
} }
if (tos_tf_module_init() != 0) { if ((ret = tos_tf_module_init()) != 0) {
return -1; return ret;
} }
return 0; return 0;

6
net/tencent_firmware_module_wrapper/tencent_firmware_module_wrapper.c
View File

@@ -56,19 +56,19 @@ int tos_tf_module_register(tencent_firmware_module_t *module)
int tos_tf_module_init(void) int tos_tf_module_init(void)
{ {
if (tos_mail_q_create(&mqtt_message_mail, mqtt_message_pool, MQTT_MESSAGE_NUM_MAX, sizeof(mqtt_message_t)) != K_ERR_NONE) { if (tos_mail_q_create(&mqtt_message_mail, mqtt_message_pool, MQTT_MESSAGE_NUM_MAX, sizeof(mqtt_message_t)) != K_ERR_NONE) {
return -1; return -2;
} }
tos_list_init(&mqtt_sub_list); tos_list_init(&mqtt_sub_list);
if (tos_mmblk_pool_create(&sub_list_node_mbp, sub_list_node_pool, MQTT_SUB_TOPIC_MAX, sizeof(mqtt_message_handlers_t)) != K_ERR_NONE) { if (tos_mmblk_pool_create(&sub_list_node_mbp, sub_list_node_pool, MQTT_SUB_TOPIC_MAX, sizeof(mqtt_message_handlers_t)) != K_ERR_NONE) {
return -1; return -3;
} }
if (tos_task_create(&mqtt_message_handle_task, "mqtt_message_handle", if (tos_task_create(&mqtt_message_handle_task, "mqtt_message_handle",
mqtt_message_handle_task_entry, NULL, MQTT_MESSAGE_HANDLE_TASK_PRIO, mqtt_message_handle_task_entry, NULL, MQTT_MESSAGE_HANDLE_TASK_PRIO,
mqtt_message_handle_task_stack, MQTT_MESSAGE_HANDLE_TASK_STACK_SIZE, 10) != K_ERR_NONE) { mqtt_message_handle_task_stack, MQTT_MESSAGE_HANDLE_TASK_STACK_SIZE, 10) != K_ERR_NONE) {
return -1; return -4;
} }
if (g_tencent_firmware_module && g_tencent_firmware_module->init) { if (g_tencent_firmware_module && g_tencent_firmware_module->init) {

2
net/tencent_firmware_module_wrapper/tencent_firmware_module_wrapper.h
View File

@@ -79,7 +79,7 @@ typedef struct mqtt_param_st {
typedef struct mqtt_message_st { typedef struct mqtt_message_st {
char topic[64]; char topic[64];
char payload[128]; char payload[256];
} mqtt_message_t; } mqtt_message_t;
typedef void (*message_handler_t)(mqtt_message_t* msg); typedef void (*message_handler_t)(mqtt_message_t* msg);