changeset 643:d779078abe40

PCM integration: pcm_init() call
author Michael Spacefalcon <msokolov@ivan.Harhan.ORG>
date Wed, 03 Sep 2014 17:50:06 +0000
parents b039cafc8e31
children 1199cdf99c32
files gsm-fw/services/ffs/task.c gsm-fw/sysglue/appinit.c
diffstat 2 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/gsm-fw/services/ffs/task.c	Wed Sep 03 17:42:09 2014 +0000
+++ b/gsm-fw/services/ffs/task.c	Wed Sep 03 17:50:06 2014 +0000
@@ -206,7 +206,7 @@
     int tmp_int_level;
     ttr_init(TTrTask|TTrTest|TTrTestInfo);
     //ttr_init(TTrTask|TTrTest|TTrTestInfo|TTrDrvErase|TTrDrvWrite|TTrTaskLow|TTrApi);
-    
+
     tmp_int_level = TCD_Interrupt_Level;  // Backup Int level
     TCD_Interrupt_Level = 0xC0;           // The Interrups are not yet enabled..
 #if FFS_IN_RAM
@@ -214,8 +214,8 @@
 #endif
     ffs_init_status = ffs_initialize();
     TCD_Interrupt_Level = tmp_int_level;  // Restore Int level
-  
-#if 0
+
+#if 0	// moved to Application_Initialize() - FreeCalypso change
     pcm_init(); // We have to call pcm_init() before G23 starts.
 #endif
 }
--- a/gsm-fw/sysglue/appinit.c	Wed Sep 03 17:42:09 2014 +0000
+++ b/gsm-fw/sysglue/appinit.c	Wed Sep 03 17:50:06 2014 +0000
@@ -16,6 +16,13 @@
 	 */
 	ABB_Sem_Create();
 	ffs_main_init();
+	/*
+	 * The call to pcm_init() used to be at the end of ffs_main_init(),
+	 * but I factored it out. - Space Falcon
+	 */
+#if CONFIG_INCLUDE_PCM
+	pcm_init();
+#endif
 	rvf_init();
 	rvm_init();
 	create_tasks();