--- a/gsm-fw/bsp/abb+spi/spi_task.c	Sun Nov 17 08:15:19 2013 +0000
+++ b/gsm-fw/bsp/abb+spi/spi_task.c	Sun Nov 17 09:17:06 2013 +0000
@@ -1,39 +1,35 @@
 /*****************************************************************************/
 /*                                                                           */
-/*  Name        spi_task.c													 */
+/*  Name        spi_task.c						     */
 /*                                                                           */
-/*  Function    this file contains the main SPI function: spi_core.			 */
-/*				It contains the body of the SPI task.						 */
-/*				It will initialize the SPI and then wait for messages		 */
-/*				or functions calls.											 */
+/*  Function    this file contains the main SPI function: spi_core.	     */
+/*		It contains the body of the SPI task.			     */
+/*		It will initialize the SPI and then wait for messages	     */
+/*		or functions calls.					     */
 /*                                                                           */
-/*  Version		0.1															 */
-/*	Author		Candice Bazanegue                   						 */
-/*																			 */
-/* 	Date       	Modification												 */
-/*  ------------------------------------									 */
-/*  20/08/2000	Create														 */
-/*  01/09/2003	Modfication         										 */
-/*	Author		Pascal Puel                         						 */
-/*																			 */
+/*  Version	0.1							     */
+/*  Author	Candice Bazanegue					     */
+/*									     */
+/*  Date       	Modification						     */
+/*  ------------------------------------				     */
+/*  20/08/2000	Create							     */
+/*  01/09/2003	Modfication         					     */
+/*  Author	Pascal Puel						     */
+/*									     */
 /* (C) Copyright 2000 by Texas Instruments Incorporated, All Rights Reserved */
 /*****************************************************************************/
 
-#ifndef _WINDOWS
-  #include "chipset.cfg"
-  #if (CHIPSET == 12)
-    #include "inth/sys_inth.h"
-  #else
-    #include "inth/iq.h"    // for IQ_Unmask()
-  #endif
+#include "../iq.h"
+
+#if 0	// FreeCalypso
   #include "power/power.h"   // for Switch_ON()
 #endif
 
-#include "rv/rv_defined_swe.h"	   // for RVM_PWR_SWE
-#include "rvm/rvm_use_id_list.h"
-#include "spi/spi_env.h"
-#include "spi/spi_process.h"
-#include "spi/spi_task.h"
+#include "../../riviera/rv/rv_defined_swe.h"	   // for RVM_PWR_SWE
+#include "../../riviera/rvm/rvm_use_id_list.h"
+#include "spi_env.h"
+#include "spi_process.h"
+#include "spi_task.h"
 
 #ifdef RVM_PWR_SWE
   #include "pwr/pwr_liion_cha.h"
@@ -53,13 +49,14 @@
 *******************************************************************************/
 T_RV_RET spi_core(void)
 {	
-	BOOLEAN error_occured = FALSE;
-	T_RV_HDR * msg_ptr;
+    BOOLEAN error_occured = FALSE;
+    T_RV_HDR * msg_ptr;
 
-	rvf_send_trace("SPI_task: Initialization", 24, NULL_PARAM, RV_TRACE_LEVEL_DEBUG_LOW, SPI_USE_ID);
+    rvf_send_trace("SPI_task: Initialization", 24, NULL_PARAM,
+			RV_TRACE_LEVEL_DEBUG_LOW, SPI_USE_ID);
     SPI_GBL_INFO_PTR->SpiTaskReady = TRUE;
 
-#ifndef _WINDOWS
+#if 0	// FreeCalypso: deferring until L1 integration
     /* Unmask External Interrupt once the SPI task is started */
     #if (CHIPSET == 12)
       // Unmask ABB ext interrupt
@@ -68,59 +65,59 @@
       // Unmask external (ABB) interrupt
       IQ_Unmask(IQ_EXT);
     #endif
-	// Get the switch on cause from ABB.
-	Set_Switch_ON_Cause();
+    // Get the switch on cause from ABB.
+    Set_Switch_ON_Cause();
 #endif
 
-	/* loop to process messages */
-	while (error_occured == FALSE)
+    /* loop to process messages */
+    while (error_occured == FALSE)
+    {
+	/* Wait for the necessary events (infinite wait for a msg in the mailbox 0). */
+	UINT16 received_event = rvf_wait (0xffff, 0);
+
+	/* If an event related to mailbox 0 is received, then */
+	if (received_event & RVF_TASK_MBOX_0_EVT_MASK) 
 	{
-		/* Wait for the necessary events (infinite wait for a msg in the mailbox 0). */
-		UINT16 received_event = rvf_wait (0xffff, 0);
-					
-		/* If an event related to mailbox 0 is received, then */
-		if (received_event & RVF_TASK_MBOX_0_EVT_MASK) 
-		{
-			/* Read the message in the driver mailbox and delegate action..*/
-			msg_ptr = (T_RV_HDR *) rvf_read_mbox(SPI_MAILBOX);
+	    /* Read the message in the driver mailbox and delegate action..*/
+	    msg_ptr = (T_RV_HDR *) rvf_read_mbox(SPI_MAILBOX);
 
             #ifdef RVM_PWR_SWE
-			if(spi_process(msg_ptr)) 
-			{
-				pwr_process(msg_ptr);
-			}
+		if(spi_process(msg_ptr)) 
+		{
+			pwr_process(msg_ptr);
+		}
             #else
-			spi_process(msg_ptr);
-			#endif
-		}
+		spi_process(msg_ptr);
+	    #endif
+	}
 
         #ifdef RVM_PWR_SWE
-		/* Timers */
+	/* Timers */
         if (received_event & SPI_TIMER0_WAIT_EVENT)
         {
            pwr_bat_test_timer_process();
         }
 
-		if (received_event & SPI_TIMER1_WAIT_EVENT)
-		/* timer used to detect the end of the CI charge */
+	if (received_event & SPI_TIMER1_WAIT_EVENT)
+	/* timer used to detect the end of the CI charge */
         {
            pwr_CI_charge_timer_process();
         }
 
         if (received_event & SPI_TIMER2_WAIT_EVENT)
-		/* timer used to detect the end of the CV charge */
-		{
+	/* timer used to detect the end of the CV charge */
+	{
            pwr_CV_charge_timer_process();
         }
         
-		if (received_event & SPI_TIMER3_WAIT_EVENT) 
-		/* timer used to check the battery discharge level */
-		{
+	if (received_event & SPI_TIMER3_WAIT_EVENT) 
+	/* timer used to check the battery discharge level */
+	{
            pwr_discharge_timer_process();
         }
-		#endif
-	}	 // end of while
-	return RV_OK;	
+	#endif
+    }	 // end of while
+    return RV_OK;	
 }