Merge branch 'master' into Remove_cond_Directives

Author: kripal-samsung

apps/examples/ble_rmc/ble_rmc_main.c

@@ -198,14 +198,16 @@ void restart_server(void) {
 	RMC_LOG(RMC_SERVER_TAG, "Start adv ... ok\n");
 }
 
-static void ble_server_connected_cb(ble_conn_handle con_handle, ble_server_connection_type_e conn_type, uint8_t mac[BLE_BD_ADDR_MAX_LEN])
+static void ble_server_connected_cb(ble_conn_handle con_handle, ble_server_connection_type_e conn_type, uint8_t mac[BLE_BD_ADDR_MAX_LEN], uint8_t adv_handle)
 {
 	RMC_LOG(RMC_SERVER_TAG, "'%s' is called\n", __FUNCTION__);
 	RMC_LOG(RMC_SERVER_TAG, "conn : %d / conn_type : %d\n", con_handle, conn_type);
 	RMC_LOG(RMC_SERVER_TAG, "conn mac : %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+	RMC_LOG(RMC_SERVER_TAG, "adv_handle : %d\n", adv_handle);
 	if (conn_type == BLE_SERVER_DISCONNECTED) {
 		restart_server();
 	}
+	adv_handle = 0xff;
 	return;
 }
 

apps/examples/testcase/Kconfig

@@ -19,7 +19,6 @@ source "$APPSDIR/examples/testcase/le_tc/drivers/Kconfig"
 source "$APPSDIR/examples/testcase/le_tc/filesystem/Kconfig"
 source "$APPSDIR/examples/testcase/le_tc/kernel/Kconfig"
 source "$APPSDIR/examples/testcase/le_tc/network/Kconfig"
-source "$APPSDIR/examples/testcase/le_tc/ttrace/Kconfig"
 source "$APPSDIR/examples/testcase/le_tc/tcp_tls/Kconfig"
 source "$APPSDIR/examples/testcase/ta_tc/arastorage/utc/Kconfig"
 source "$APPSDIR/examples/testcase/ta_tc/arastorage/itc/Kconfig"

apps/examples/testcase/Makefile

@@ -208,9 +208,6 @@ ifeq ($(CONFIG_EXAMPLES_TESTCASE_TASK_MANAGER_ITC),y)
 	$(Q) $(call REGISTER,tm_itc,tm_itc_main,TASH_EXECMD_ASYNC,101,2048)
 	$(Q) $(call REGISTER,start_itc_sampl,taskmanager_start_sample_main,TASH_EXECMD_ASYNC,101,2048)
 endif
-ifeq ($(CONFIG_EXAMPLES_TESTCASE_TTRACE),y)
-	$(Q) $(call REGISTER,ttrace_tc,tc_ttrace_main,TASH_EXECMD_ASYNC,100,2048)
-endif
 ifeq ($(CONFIG_EXAMPLES_TESTCASE_WIFI_MANAGER_UTC),y)
 	$(Q) $(call REGISTER,wifimgr_utc,utc_wifimanager_main,TASH_EXECMD_ASYNC,100,4096)
 endif

apps/examples/testcase/le_tc/compression/tc_compress_read.c

@@ -305,6 +305,46 @@ static void tc_comp_name(void)
 	TC_SUCCESS_RESULT();
 }
 
+/****************************************************************************
+ * Name: tc_comp_file_decomp
+ *
+ * Description:
+ *   Testing decompression of the compressed file
+ *
+ * Returned Value:
+ *   None
+ ****************************************************************************/
+static void tc_comp_file_decomp(void)
+{
+	int ret;
+	fd = get_compfd();
+
+	/*If FAIL : Failed to open testcase driver*/
+	TC_ASSERT_GEQ("get_compfd", fd, OK);
+
+	// Before running check compressed file should exist /mnt/dummy_comp
+	const char *file_path = "/mnt/dummy_comp.dat";
+
+	// initialising decompression framework in kernel
+	ret = ioctl(fd, COMPIOC_FCOMP_INIT, file_path);
+	TC_ASSERT_EQ("compress_init", ret, OK);
+
+	// to get buffer size require to hold decompressed data
+	ret = ioctl(fd, COMPIOC_FCOMP_GET_BUFSIZE, NULL);
+	TC_ASSERT_GT("get_compression_header", ret, OK);
+	uint8_t *dst_buffer = (uint8_t *)malloc(ret);
+
+	// Test decompression method
+	ret = ioctl(fd, COMPIOC_FCOMP_DECOMPRESS, dst_buffer);
+	TC_ASSERT_EQ_CLEANUP("compress_read", ret, OK, free(dst_buffer));
+
+	ret = ioctl(fd, COMPIOC_FCOMP_DEINIT, NULL);
+	TC_ASSERT_EQ_CLEANUP("compress_uninit", ret, OK, free(dst_buffer));
+
+	free(dst_buffer);
+	TC_SUCCESS_RESULT();
+}
+
 /****************************************************************************
  * Public Function
  ****************************************************************************/
@@ -316,6 +356,7 @@ int tc_compress_main(void)
 	tc_comp_decomp_buffer_lesser_output_size();
 	tc_comp_decomp_buffer_greater_output_size();
 	tc_compressed_file_read();
+	tc_comp_file_decomp();
 
 	return 0;
 }