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

Merge pull request #154 from DavidLin1577/patch-2

Browse Source 
Minor optimizes such as output info err etc
This commit is contained in:
Arthur
2020-04-27 15:13:11 +08:00
committed by GitHub
parent e8c135e2bb 9c9dfb8193
commit efaa24a5c8
7 changed files with 169 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/connectivity/qcloud-iot-explorer-sdk/port/TencentOS_tiny/HAL_AT_UART_tencentos_tiny.c
View File

@@ -85,4 +85,5 @@ int HAL_AT_Uart_Deinit(void)
{ {
return QCLOUD_RET_SUCCESS; return QCLOUD_RET_SUCCESS;
} }
#endif
#endif/*AT_TCP_ENABLED*/

2
components/connectivity/qcloud-iot-explorer-sdk/port/TencentOS_tiny/HAL_Device_tencentos_tiny.c
View File

@@ -147,7 +147,7 @@ int HAL_GetGwDevInfo(void *pgwDeviceInfo)
ret |= device_info_copy(gwDevInfo->sub_dev_info[0].device_name, sg_sub_device_name, MAX_SIZE_OF_DEVICE_NAME); ret |= device_info_copy(gwDevInfo->sub_dev_info[0].device_name, sg_sub_device_name, MAX_SIZE_OF_DEVICE_NAME);
#else #else
Log_e("HAL_GetDevInfo from json not implement yet"); Log_e("HAL_GetGwDevInfo from json not implement yet");
ret = QCLOUD_ERR_DEV_INFO; ret = QCLOUD_ERR_DEV_INFO;
#endif #endif

3
components/connectivity/qcloud-iot-explorer-sdk/port/TencentOS_tiny/HAL_OS_tencentos_tiny.c
View File

@@ -32,7 +32,6 @@ void HAL_SleepMs(_IN_ uint32_t ms)
(void)tos_sleep_hmsm(0,0,0, ms); (void)tos_sleep_hmsm(0,0,0, ms);
} }
void HAL_Printf(_IN_ const char *fmt, ...) void HAL_Printf(_IN_ const char *fmt, ...)
{ {
va_list args; va_list args;
@@ -61,7 +60,6 @@ int HAL_Vsnprintf(_IN_ char *str, _IN_ const int len, _IN_ const char *format, v
return vsnprintf(str, len, format, ap); return vsnprintf(str, len, format, ap);
} }
void *HAL_Malloc(_IN_ uint32_t size) void *HAL_Malloc(_IN_ uint32_t size)
{ {
return tos_mmheap_alloc(size); return tos_mmheap_alloc(size);
@@ -182,6 +180,5 @@ void HAL_SemaphorePost(void *sem)
int HAL_SemaphoreWait(void *sem, uint32_t timeout_ms) int HAL_SemaphoreWait(void *sem, uint32_t timeout_ms)
{ {
return osSemaphoreWait ((osSemaphoreId)sem, timeout_ms); return osSemaphoreWait ((osSemaphoreId)sem, timeout_ms);
} }
#endif #endif

2
components/connectivity/qcloud-iot-explorer-sdk/port/TencentOS_tiny/HAL_Timer_tencentos_tiny.c
View File

@@ -50,7 +50,7 @@ char* HAL_Timer_current(void)
long time_sec; long time_sec;
time_sec = HAL_Timer_current_sec(); time_sec = HAL_Timer_current_sec();
memset(now_time_str, 0, 20); memset(now_time_str, 0, sizeof(now_time_str));
snprintf(now_time_str, 20, "%ld", time_sec); snprintf(now_time_str, 20, "%ld", time_sec);
return now_time_str; return now_time_str;

2
components/connectivity/qcloud-iot-explorer-sdk/port/TencentOS_tiny/HAL_UDP_lwip.c
View File

@@ -158,4 +158,4 @@ int HAL_UDP_ReadTimeout(uintptr_t fd, unsigned char *p_data, unsigned int datale
return HAL_UDP_Read(fd, p_data, datalen); return HAL_UDP_Read(fd, p_data, datalen);
} }
#endif #endif/*COAP_COMM_ENABLED*/

7
components/connectivity/qcloud-iot-explorer-sdk/port/TencentOS_tiny/HAL_UDP_module.c
View File

@@ -32,16 +32,15 @@
uintptr_t HAL_UDP_Connect(const char *host, unsigned short port) uintptr_t HAL_UDP_Connect(const char *host, unsigned short port)
{ {
int fd; int fd;
char port_str[PORT_BUFF_LEN]; char port_str[PORT_BUFF_LEN] = {0};
memset(port_str, 0, PORT_BUFF_LEN);
snprintf(port_str, PORT_BUFF_LEN, "%u", port); snprintf(port_str, PORT_BUFF_LEN, "%u", port);
Log_i("osal_udp_connect entry, host=%s port=%d(%s)", host , port, port_str); Log_i("osal_udp_connect entry, host=%s port=%d(%s)", host , port, port_str);
fd = tos_sal_module_connect("111.230.127.136", "5684", TOS_SAL_PROTO_UDP); fd = tos_sal_module_connect("111.230.127.136", "5684", TOS_SAL_PROTO_UDP);
if (fd < 0) { if (fd < 0) {
Log_i("net connect fail\n\r"); Log_i("net connect fail\n\r");
if (QCLOUD_RET_SUCCESS == tos_sal_module_init()) { /* ÖØгõʼ»¯Ä£×é */ if (QCLOUD_RET_SUCCESS == tos_sal_module_init()) {
Log_i("net reinit success\n\r"); Log_i("net reinit success\n\r");
fd = tos_sal_module_connect(host, port_str, TOS_SAL_PROTO_UDP); fd = tos_sal_module_connect(host, port_str, TOS_SAL_PROTO_UDP);
if (fd < 0) { if (fd < 0) {
@@ -115,4 +114,4 @@ int HAL_UDP_ReadTimeout(uintptr_t fd, unsigned char *p_data, unsigned int datale
return QCLOUD_RET_SUCCESS; return QCLOUD_RET_SUCCESS;
} }
#endif #endif/*COAP_COMM_ENABLED*/