[hal] fix the void * pointer calculation issue

Signed-off-by: Yang, Xiao <[email protected]>

Author: Yang, Xiao

build-rules/_rules-top.mk

@@ -71,7 +71,7 @@ one:
 	    ALL_LIBS="$(strip $(foreach V,$(SUBDIRS),$(LIBA_TARGET_$(V))))" \
 	    ALL_PROG="$(strip $(foreach V,$(SUBDIRS),$(TARGET_$(V))))" \
 	    COMP_LIB_OBJS="$(COMP_LIB_OBJS)" \
-	    bash $(RULE_DIR)/scripts/gen_one_makefile.sh $(STAMP_ONE_MK)
+	    bash $(RULE_DIR)/scripts/gen_one_makefile.sh
 
 config:
 

build-rules/scripts/gen_one_makefile.sh

@@ -1,6 +1,6 @@
 #! /bin/bash
 
-TARGET_FILE=$1
+TARGET_FILE=${OUTPUT_DIR}/.one_makefile
 rm -f ${TARGET_FILE}
 
 CONFIG_VERNDOR=$(grep -m 1 "VENDOR *:" .config|awk '{ print $NF }')

src/board/config.xboard.make

@@ -5,7 +5,7 @@ CONFIG_ENV_CFLAGS += -DSTM32L496xx \
 					 --cpu=Cortex-M4 \
 					 --apcs=interwork \
 					 --split_sections
-CONFIG_ENV_CFLAGS += -c --c99 -D__MICROLIB -g --gnu --library_type=microlib -W -Ospace -O3 -Isrc/infra/stdc/armlibc
+CONFIG_ENV_CFLAGS += -c --c99 -D__MICROLIB -g --gnu --library_type=microlib -W -Ospace -O3 -Iprebuilt/extra/stdc/armlibc
 OVERRIDE_AR:=armar -rcs
 
 else ifeq ($(COMPILER),iar)
@@ -14,7 +14,7 @@ CONFIG_ENV_CFLAGS += -DSTM32L496xx \
 					--cpu=Cortex-M4 \
                     --cpu_mode=thumb \
                     --endian=little 		    
-CONFIG_ENV_CFLAGS += --vla -e --dlib_config=full -D_TIMESPEC_DEFINED --silent --only_stdout --no_warnings --diag_warning=Pe167,Pe144,Pe513 -Ohz -Isrc/infra/stdc/iarlibc
+CONFIG_ENV_CFLAGS += --vla -e --dlib_config=full -D_TIMESPEC_DEFINED --silent --only_stdout --no_warnings --diag_warning=Pe167,Pe144,Pe513 -Ohz -Iprebuilt/extra/stdc/iarlibc
 OVERRIDE_AR:=iarchive --create
 
 else

src/protocol/http/iotx_http_api.c

@@ -145,17 +145,22 @@ static int http_report_func(void *handle, const char *topic_name, int req_ack, v
 {
     iotx_http_message_param_t   msg_param;
     char                        request_buf[1024];
+    char                        topic_path[100];
+
     if (handle == NULL || topic_name == NULL || data == NULL) {
         http_err("params err");
         return -1;
     }
+
+    HAL_Snprintf(topic_path, sizeof(topic_path), "/topic%s", topic_name);
+
     memset(&msg_param, 0, sizeof(iotx_http_message_param_t));
     msg_param.request_payload = (char *)data;
     msg_param.response_payload = request_buf;
     msg_param.timeout_ms = CONFIG_MID_HTTP_TIMEOUT;
     msg_param.request_payload_len = len;
     msg_param.response_payload_len = 1024;
-    msg_param.topic_path = (char *)topic_name;
+    msg_param.topic_path = topic_path;
 
     return IOT_HTTP_SendMessage(handle, &msg_param);
 }
@@ -193,6 +198,10 @@ void *IOT_HTTP_Init(iotx_http_param_t *pInitParams)
 
     p_devinfo = pInitParams->device_info;
 
+    HAL_SetProductKey(p_devinfo->product_key);
+    HAL_SetDeviceName(p_devinfo->device_name);
+    HAL_SetDeviceSecret(p_devinfo->device_secret);
+
     iotx_http_context = (iotx_http_t *)HTTP_API_MALLOC(sizeof(iotx_http_t));
 
     if (NULL == iotx_http_context) {
@@ -481,12 +490,22 @@ int IOT_HTTP_DeviceNameAuth(void *handle)
     iotx_set_report_func(http_report_func);
     /* report module id */
     ret = iotx_report_mid(iotx_http_context);
-    // /* report module id */
-    // ret = iotx_http_report_mid(iotx_http_context);
     if (SUCCESS_RETURN != ret) {
         http_err("Send ModuleId message to server(Http) failed, ret = %d", ret);
         goto do_exit;
     }
+    /* report device information */
+    ret = iotx_report_devinfo(iotx_http_context);
+    if (SUCCESS_RETURN != ret) {
+        http_err("Send devinfo message to server(Http) failed, ret = %d", ret);
+        goto do_exit;
+    }
+    /* report firmware */
+    ret = iotx_report_firmware_version(iotx_http_context);
+    if (SUCCESS_RETURN != ret) {
+        http_err("Send firmware message to server(Http) failed, ret = %d", ret);
+        goto do_exit;
+    }        
 
     ret = 0;
 

src/ref-impl/hal/ssl/mbedtls/HAL_TLS_mbedtls.c

@@ -274,14 +274,14 @@ static int mbedtls_net_connect_timeout(mbedtls_net_context *ctx, const char *hos
 
 void *_SSLCalloc_wrapper(size_t n, size_t size)
 {
-    void *buf = NULL;
+    unsigned char *buf = NULL;
     mbedtls_mem_info_t *mem_info = NULL;
 
     if (n == 0 || size == 0) {
         return NULL;
     }
 
-    buf = g_ssl_hooks.malloc(n * size + sizeof(mbedtls_mem_info_t));
+    buf = (unsigned char *)(g_ssl_hooks.malloc(n * size + sizeof(mbedtls_mem_info_t)));
     if (NULL == buf) {
         return NULL;
     } else {
@@ -311,7 +311,7 @@ void _SSLFree_wrapper(void *ptr)
         return;
     }
 
-    mem_info = ptr - sizeof(mbedtls_mem_info_t);
+    mem_info = (mbedtls_mem_info_t *)((unsigned char *)ptr - sizeof(mbedtls_mem_info_t));
     if (mem_info->magic != MBEDTLS_MEM_INFO_MAGIC) {
         hal_info("Warning - invalid mem info magic: 0x%x\r\n", mem_info->magic);
         return;