[Feature][ZXW-88]merge P50 version

Only Configure: No
Affected branch: master
Affected module: unknown
Is it affected on both ZXIC and MTK: only ZXIC
Self-test: Yes
Doc Update: No

Change-Id: I34667719d9e0e7e29e8e4368848601cde0a48408
diff --git a/ap/app/shm_test/shm_test.c b/ap/app/shm_test/shm_test.c
index 2bc1dea..2fdf0e5 100755
--- a/ap/app/shm_test/shm_test.c
+++ b/ap/app/shm_test/shm_test.c
@@ -55,24 +55,33 @@
 {
 	int  shmid = 0;
 	char *pshm = NULL;
-	key_t key = 0xFFFFF001;
+	key_t key = 0xFFFFF801;
 
 	prctl(PR_SET_NAME, "shm_alloc_task");
 
 	/*alloc two pages*/
 	shmid = shmget(key, SHM_ALLOC_TWO_PAGE_SIZE, 0666|IPC_CREAT);
 	if(shmid < 0)
+	{
 		printf("shmid return error\n");
+		return -1;
+	}
 
 	pshm = (char *)shmat(shmid, 0, 0);
 	if (pshm == NULL)
+	{
 		printf("shmat return error\n");
+		return -1;
+	}	
 
 	g_shmid[SHM_TEST_ALLOC_THREAD] = shmid;
 	g_pshm[SHM_TEST_ALLOC_THREAD]	= pshm;
 	shmdt(pshm);
 	if(shmctl(shmid, IPC_RMID,0) == -1)
+	{
 		printf("shmctl error\n");
+        return -1;
+	}
 
 	while(1)
 	{
@@ -84,7 +93,7 @@
 {
 	int  shmid = 0;
 	char *pshm = NULL;
-	key_t key = 0xFFFFF002;
+	key_t key = 0xFFFFF802;
 
 	prctl(PR_SET_NAME, "shm_mem_task");
 
@@ -114,7 +123,7 @@
 	int   shmid    = 0;
 	int   test_num = 0;
 	int   *pshm    = NULL;
-	key_t key      = 0xFFFFF003;
+	key_t key      = 0xFFFFF803;
 
 	prctl(PR_SET_NAME, "shm_task");
 	
@@ -197,7 +206,7 @@
 	int   shmid    = 0;
 	char  test_num = 0;
 	char  *pshm    = NULL;
-	key_t key      = 0xFFFFF004;
+	key_t key      = 0xFFFFF804;
 
 	prctl(PR_SET_NAME, "shm_cross_task");