FreeCalypso > hg > fc-magnetite

changeset 201:f3f58412df01

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
src/condat3/com/include: pwr.h and rtc.h replaced with TCS211 versions as part of the TCS2/TCS3 hybrid effort
author Mychaela Falconia <falcon@freecalypso.org>
date Fri, 14 Oct 2016 05:49:28 +0000
parents 876b6c569e36
children 2a93a98a1e26
files src/condat3/com/include/pwr.h src/condat3/com/include/rtc.h src/g23m-aci/aci/cmh_mmq.c
diffstat 3 files changed, 5 insertions(+), 82 deletions(-) [+]
line wrap: on
line diff
--- a/src/condat3/com/include/pwr.h	Fri Oct 14 03:51:07 2016 +0000
+++ b/src/condat3/com/include/pwr.h	Fri Oct 14 05:49:28 2016 +0000
@@ -17,26 +17,11 @@
 |  Purpose :  Types definitions for the power driver
 |             .
 +----------------------------------------------------------------------------- 
-$History: Pwr.h
-	Dec 05, 2006 REF:OMAPS00106691 a0393213(R.Prabakar)
-	Description:compiler error is arising in simulation build since timer.h is not included in simulation build
-	Solution    :flag off timer.h and its dependencies in gdi
-
-      Oct 30,2006 ER:OMAPS00091029 x0039928(sumanth)
-      Bootup time measurement
-      
-	Apr 17, 2006    REF: ER OMAPS00075178 x0pleela
-   	Description: When the charger connect to phone(i-sample), the charger driver works, but the MMI and App don't work
-   	Solution: Defined macros for charging events
-
 */ 
 
 #ifndef PWR_H
 #define PWR_H
 
-#ifndef _SIMULATION_
-#include "timer.h" /*OMAPS00091029 x0039928(sumanth)*/
-#endif
 
 /*
  * Power signals
@@ -48,15 +33,8 @@
 /*
  * Power Status
  */
-#define PWR_BATTERY_ON       		0  // use battery power //x0pleela 10 Apr, 2006 ER: OMAPS00075178
 #define PWR_EXTPOWER_ON      1
-#define PWR_CHARGER_ON         6 //x0pleela 11 Apr, 2006 changed the value from 2 to 6
-
-//x0pleela 10 Apr, 2006 ER: OMAPS00075178
-#define PWR_CHARGER_BEGIN       	2 // charger begin 
-#define PWR_CHARGER_STOP     	3 // charger end
-#define PWR_CHARGER_PLUG   	4 // charger plug 
-#define PWR_CHARGER_UNPLUG  	5 // charger unplug
+#define PWR_CHARGER_ON       2
 
 /*
  * Status Type
@@ -78,17 +56,6 @@
   UBYTE    Steps;
 } pwr_DCB_Type;
 
-/*OMAPS00091029 x0039928(sumanth)*/
-#ifndef _SIMULATION_
-typedef enum BootTimeEvent
-{
-  EPreBoot=0,
-  EAppInit,
-  EModemBoot,
-  ENetworkSync
-} BootTimeEvent;
-#endif
-
 #if defined (NEW_FRAME)
 /*
  * to achieve backward compatibility with older definitions
@@ -109,8 +76,5 @@
 EXTERN UBYTE pwr_GetStatus   (pwr_Status_Type   * out_StatusPtr);
 
 EXTERN UBYTE pwr_PowerOffMobile   (void);
-#ifndef _SIMULATION_
-EXTERN void Bsp_get_boot_time(unsigned int * boot_time); /*OMAPS00091029 x0039928(sumanth)*/
-void boot_time_snapshot(BootTimeEvent event);	
+
 #endif
-#endif
--- a/src/condat3/com/include/rtc.h	Fri Oct 14 03:51:07 2016 +0000
+++ b/src/condat3/com/include/rtc.h	Fri Oct 14 05:49:28 2016 +0000
@@ -17,11 +17,6 @@
 |  Purpose :  Type definitions and function prototypes for the real time clock driver
 |             SPR 1725, re-wrote file for new RTC driver implementation.
 +----------------------------------------------------------------------------- 
-
-    Aug 02, 2006 REF:OMAPS00083404 Prabakar R (a0393213)
-    Description: Removal of clone code: entity GDI
-    Solution: Two similar functions(rtc_get_time_date() and rtc_get_alarm()) are made into one function rtc_get_time_date().
-    As a result, interface for rtc_get_time_date() has been changed. The change is only for locosto.
 */ 
 
 #ifndef DEF_RTC__H
@@ -58,18 +53,6 @@
 	BOOL	PM_flag;
 } T_RTC_TIME;
 
-/*
-    Aug 02, 2006 REF:OMAPS00083404 Prabakar R (a0393213)
-    Description: Removal of clone code: entity GDI
-    Solution: Two similar functions(rtc_get_time_date() and rtc_get_alarm()) are made into one function rtc_get_time_date().
-                 This type is added to differenciate the functionality in the function.
-*/
-typedef enum
-{
-	RTC_TIME_TYPE_CURRENT,
-	RTC_TIME_TYPE_ALARM
-} T_RTC_TIME_TYPE;
-
 typedef void (*RtcCallback) (void*);  /* RTC event handler        */
 
 /*
@@ -81,23 +64,11 @@
 
 UBYTE rtc_set_time_date(T_RTC_DATE* date, T_RTC_TIME* time); // wrapper for  RTC_setTimeDate();
 
-/*
-    Aug 02, 2006 REF:OMAPS00083404 Prabakar R (a0393213)
-    Description: Removal of clone code: entity GDI
-    Solution: Two similar functions(rtc_get_time_date() and rtc_get_alarm()) are made into one function rtc_get_time_date()
-    As a result interface of rtc_get_time_date() has been changed. A new parameter 'type' has been added.
-                 
-*/
-UBYTE rtc_get_time_date(T_RTC_DATE* date, T_RTC_TIME* time , T_RTC_TIME_TYPE type ); // wrapper for RTC_getTimeDate();
+UBYTE rtc_get_time_date(T_RTC_DATE* date, T_RTC_TIME* time); // wrapper for RTC_getTimeDate();
 
 UBYTE rtc_set_alarm(T_RTC_DATE* date , T_RTC_TIME* time, RtcCallback callback_func );//wrapper for RTC_setAlarm();
 
-/*
-    Aug 02, 2006 REF:OMAPS00083404 Prabakar R (a0393213)
-    Description: Removal of clone code: entity GDI
-    Solution: Two similar functions(rtc_get_time_date() and rtc_get_alarm()) are made into one function rtc_get_time_date()
-    So rtc_get_alarm() is removed. To get the time which is set for alarm, use rtc_get_time_date() with RTC_TIME_TYPE_ALARM as third argument                 
-*/
+UBYTE rtc_get_alarm(T_RTC_DATE* date, T_RTC_TIME* time);//wrapper for RTC_getAlarm();
 
 UBYTE rtc_unset_alarm();//wrapper for RTC_UnsetAlarm();
 
--- a/src/g23m-aci/aci/cmh_mmq.c	Fri Oct 14 03:51:07 2016 +0000
+++ b/src/g23m-aci/aci/cmh_mmq.c	Fri Oct 14 05:49:28 2016 +0000
@@ -17,11 +17,6 @@
 |  Purpose :  This module provides the query functions related to the
 |             protocol stack adapter for mobility management.
 +----------------------------------------------------------------------------- 
-   Aug 02, 2006 REF:OMAPS00083404 Prabakar R (a0393213)
-   Description: Removal of clone code: entity GDI
-   Solution: Two similar functions(rtc_get_time_date() and rtc_get_alarm()) are made into one function rtc_get_time_date().
-   As a result, interface for rtc_get_time_date() has been changed. Change has been done here to be 
-   consistent with the new interface.	
 */ 
 
 #ifndef CMH_MMQ_C
@@ -867,14 +862,7 @@
 
   TRACE_EVENT("qAT_PlusCCLK(): get time and date " );
 #ifndef _SIMULATION_
-  /*
-  Aug 02, 2006 REF:OMAPS00083404 Prabakar R (a0393213)
-       Description: Removal of clone code: entity GDI
-       Solution: Two similar functions(rtc_get_time_date() and rtc_get_alarm()) are made into one function rtc_get_time_date().
-       As a result, interface for rtc_get_time_date() has been changed. Change has been done here to be 
-       consistent with the new interface.
-  */
-  ret = rtc_get_time_date((T_RTC_DATE *) date_s, (T_RTC_TIME *) time_s, RTC_TIME_TYPE_CURRENT);
+  ret = rtc_get_time_date((T_RTC_DATE *) date_s, (T_RTC_TIME *) time_s);
   switch (ret)
   {
     case 0:                     /* RVF_OK */