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

Merge pull request #203 from DavidLin1577/patch-4

Browse Source 
Update osal_os.c
This commit is contained in:
Supowang
2020-07-20 11:45:55 +08:00
committed by GitHub
parent bbdedd4994 2533fdd50e
commit c530ba952d
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
components/connectivity/iotkit-embedded-3.0.1/port/TencentOS_tiny/osal_os.c
View File

@@ -173,7 +173,7 @@ int HAL_GetFirmwareVersion(char *version)
char *ver = "app-1.0.0-20180101.1000"; char *ver = "app-1.0.0-20180101.1000";
int len = strlen(ver); int len = strlen(ver);
memset(version, 0x0, IOTX_FIRMWARE_VER_LEN); memset(version, 0x0, IOTX_FIRMWARE_VER_LEN);
strncpy(version, ver, IOTX_FIRMWARE_VER_LEN); strncpy(version, ver, len);
version[len] = '\0'; version[len] = '\0';
return strlen(version); return strlen(version);
} }
@@ -190,7 +190,7 @@ void *HAL_MutexCreate(void)
void HAL_MutexDestroy(void *mutex) void HAL_MutexDestroy(void *mutex)
{ {
k_err_t ret; k_err_t ret;
if (K_ERR_NONE != (ret = tos_mutex_destroy((k_mutex_t *)mutex))) { if (K_ERR_NONE != (ret = tos_mutex_destroy((k_mutex_t *)mutex))) {
HAL_Printf("osal_mutex_destroy err, err:%d\n\r", ret); HAL_Printf("osal_mutex_destroy err, err:%d\n\r", ret);
@@ -210,16 +210,16 @@ void HAL_MutexLock(void *mutex)
void HAL_MutexUnlock(void *mutex) void HAL_MutexUnlock(void *mutex)
{ {
k_err_t ret; k_err_t ret;
if (K_ERR_NONE != (ret = tos_mutex_post((k_mutex_t *)mutex))) { if (K_ERR_NONE != (ret = tos_mutex_post((k_mutex_t *)mutex))) {
HAL_Printf("osal_mutex_unlock err, err:%d\n\r", ret); HAL_Printf("osal_mutex_unlock err, err:%d\n\r", ret);
} }
} }
void *HAL_Malloc(uint32_t size) void *HAL_Malloc(uint32_t size)
{ {
return tos_mmheap_alloc(size); return tos_mmheap_alloc(size);
} }
void HAL_Free(void *ptr) void HAL_Free(void *ptr)