--- a/src/cs/system/main/create_RVtasks.c	Sun May 02 04:25:48 2021 +0000
+++ b/src/cs/system/main/create_RVtasks.c	Sun May 02 04:34:12 2021 +0000
@@ -353,23 +353,23 @@
 #endif
 
 #ifdef RVM_I2C_SWE
-	rv_start_swe_and_check (I2C_USE_ID, "I2C");
+    rv_start_swe_and_check (I2C_USE_ID, "I2C");
 #endif
 
 #ifdef RVM_DMA_SWE
-	rv_start_swe_and_check (DMA_USE_ID, "DMA");
+    rv_start_swe_and_check (DMA_USE_ID, "DMA");
 #endif
 
 #ifdef RVM_DMG_SWE
-	rv_start_swe_and_check (DMG_USE_ID, "DMG");
+    rv_start_swe_and_check (DMG_USE_ID, "DMG");
 #endif
 
 #ifdef RVM_NAN_SWE
-	rv_start_swe_and_check (NAN_USE_ID, "NAN");
+    rv_start_swe_and_check (NAN_USE_ID, "NAN");
 #endif
 
 #ifdef RVM_MC_SWE
-	rv_start_swe_and_check (MC_USE_ID, "MC");
+    rv_start_swe_and_check (MC_USE_ID, "MC");
 #endif
 
 #ifdef RVM_FFS_SWE
@@ -417,7 +417,6 @@
     rv_start_swe_and_check (LCD_USE_ID, "LCD");
 #endif
 
-
 #ifdef RVM_ETM_SWE
     /* initialize ETM SWE */
     rv_start_swe_and_check (ETM_USE_ID, "ETM");
@@ -428,7 +427,6 @@
     rv_start_swe_and_check (TTY_USE_ID, "TTY");
 #endif
 
-
 #ifdef RVM_AUDIO_MAIN_SWE
     /* initialize AUDIO SWE */
     rv_start_swe_and_check (AUDIO_USE_ID, "AUDIO");
@@ -473,17 +471,17 @@
 
 #ifdef RVM_TUT_SWE
     /* initialize TUT SWE */
-//	rv_start_swe_and_check (TUT_USE_ID, "TUT");
+//  rv_start_swe_and_check (TUT_USE_ID, "TUT");
 #endif
 
 #ifdef RVM_RGUI_SWE
     /* initialize RGUI SWE */
-	rv_start_swe_and_check (RGUI_USE_ID, "RGUI");
+    rv_start_swe_and_check (RGUI_USE_ID, "RGUI");
 #endif
 
 #ifdef RVM_ATP_SWE
-	/* initialize ATP SWE */
-	rv_start_swe_and_check (ATP_USE_ID, "ATP");
+    /* initialize ATP SWE */
+    rv_start_swe_and_check (ATP_USE_ID, "ATP");
 #endif
 
 /*
@@ -493,29 +491,29 @@
  */
 #if 0
 #ifdef RVM_MKS_SWE
-	rv_start_swe_and_check (MKS_USE_ID, "MKS");
+    rv_start_swe_and_check (MKS_USE_ID, "MKS");
 #endif
 #endif
 
 #ifdef RVM_IMG_SWE
-	rv_start_swe_and_check (IMG_USE_ID, "IMG");
+    rv_start_swe_and_check (IMG_USE_ID, "IMG");
 #endif
 
 #ifdef RVM_GBI_SWE
-	rv_start_swe_and_check (GBI_USE_ID, "GBI");
+    rv_start_swe_and_check (GBI_USE_ID, "GBI");
 #endif
 
 #ifdef RVM_CAMD_SWE
-	rv_start_swe_and_check (CAMD_USE_ID, "CAMD");
+    rv_start_swe_and_check (CAMD_USE_ID, "CAMD");
 #endif
 
 #ifdef RVM_USB_SWE
     /* initialize USB SWE */
-	rv_start_swe_and_check (USB_USE_ID, "USB");
+    rv_start_swe_and_check (USB_USE_ID, "USB");
 #endif
 
 #ifdef RVM_CAMA_SWE
-	rv_start_swe_and_check (CAMA_USE_ID, "CAMA");
+    rv_start_swe_and_check (CAMA_USE_ID, "CAMA");
 #endif
 
 #ifdef RVM_MFW_SWE
@@ -530,25 +528,24 @@
 
 #ifdef RVM_USBFAX_SWE
     /* initialize USB SWE */
-	rv_start_swe_and_check (USBFAX_USE_ID, "USBFAX");
+    rv_start_swe_and_check (USBFAX_USE_ID, "USBFAX");
 #endif
 
 #ifdef RVM_USBTRC_SWE
     /* initialize USBTRC SWE */
-	rv_start_swe_and_check (USBTRC_USE_ID, "USBTRC");
+    rv_start_swe_and_check (USBTRC_USE_ID, "USBTRC");
 #endif
 
 #ifdef RVM_USBMS_SWE
     /* initialize USBMS SWE */
-	rv_start_swe_and_check (USBMS_USE_ID, "USBMS");
+    rv_start_swe_and_check (USBMS_USE_ID, "USBMS");
 #endif
 
 #ifdef RVM_RFS_SWE
     /* initialize RFS SWE */
-	rv_start_swe_and_check (RFS_USE_ID, "RFS");
+    rv_start_swe_and_check (RFS_USE_ID, "RFS");
 #endif
 
-
 #ifdef RVM_CCI_SWE
     /* initialize CCI SWE */
     rv_start_swe_and_check (CCI_USE_ID, "CCI");
@@ -561,17 +558,17 @@
 #ifdef RVM_JPEG_SWE
     /* initialize sample JPEG SWE */
     rv_start_swe_and_check (JPEG_USE_ID, "JPEG");
-#endif    
+#endif
 #ifdef RVM_JPEG_SWE
     /* initialize sample JPEG SWE */
     rv_start_swe_and_check (JPEG_USE_ID, "JPEG");
-#endif    
+#endif
 #endif
 // WARNING WARNING ----------------------------------------------------
 // Do not perform any SWE initialization after this line !
 // WARNING WARNING ----------------------------------------------------
 
-#if (REMU==0) /* moved this to kpd start function.  rv_start function for REMU. rv_start is called from Application Initialize 
+#if (REMU==0) /* moved this to kpd start function.  rv_start function for REMU. rv_start is called from Application Initialize
 context.  Since this is a blocking call, we cannot afford to block in Application_Initialization. */
 #ifndef _WINDOWS
     // Perform switch ON processing.
@@ -586,16 +583,16 @@
 #if (CHIPSET!=15) || (REMU==0)
     /* dump the Riviera memory state */
     rvf_delay (RVF_MS_TO_TICKS (300)) ;
-	rvf_dump_mem ();
+    rvf_dump_mem ();
     rvf_dump_pool();
     rvf_dump_tasks();
 #endif
 #if (TEST==1)
 #if (PSP_STANDALONE == 1)
-	/* Just For Testing Reset of UICC */
-//   bspUicc_reset(1,0);   
+     /* Just For Testing Reset of UICC */
+//   bspUicc_reset(1,0);
 
-	/* Just For Testing GEA */
+     /* Just For Testing GEA */
 //   bspTest_Gea3_ciph_req(1);
 
 #endif
@@ -612,15 +609,15 @@
         result++;
     }
 
-#if (PSP_STANDALONE == 1)	
-/* Just For Testing Reset of UICC */	
-bspUicc_reset(1,0);	/* Just For Testing GEA */	
-bspTest_Gea3_ciph_req(1);    
+#if (PSP_STANDALONE == 1)
+/* Just For Testing Reset of UICC */
+bspUicc_reset(1,0);	/* Just For Testing GEA */
+bspTest_Gea3_ciph_req(1);
 #endif
 
 // Go to the 'Test Selection Menu' (using rv_test ()).
     rv_test (0);
-#endif	
+#endif
 #endif // (TEST==1)
 
 #if (CHIPSET!=15) || (REMU==0)
@@ -631,7 +628,7 @@
 #endif
 }
 
-#if (TEST==1) 
+#if (TEST==1)
   #define RV_START_TASK_STACK (4096)
 #else
   #define RV_START_TASK_STACK (1024)
@@ -660,6 +657,3 @@
 
 }
 #endif
-
-
-