changeset 567:528fa901ae79

L1: l1_pwmgr.c compiles with stripped-down version of l1_pwmgr.h
author Michael Spacefalcon <msokolov@ivan.Harhan.ORG>
date Fri, 08 Aug 2014 07:35:35 +0000
parents 065bf2b63a95
children ae24e49c41a9
files gsm-fw/L1/cfile/Makefile gsm-fw/L1/cfile/l1_pwmgr.c gsm-fw/L1/include/l1_pwmgr.h
diffstat 3 files changed, 30 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/gsm-fw/L1/cfile/Makefile	Fri Aug 08 05:32:56 2014 +0000
+++ b/gsm-fw/L1/cfile/Makefile	Fri Aug 08 07:35:35 2014 +0000
@@ -8,7 +8,7 @@
 
 IOBJS=	l1_api_hisr.o l1_cmplx_intram.o l1_ctl.o l1_drive.o l1_func.o \
 	l1_mfmgr.o
-XOBJS=	l1_afunc.o l1_async.o l1_cmplx.o l1_init.o #l1_pwmgr.o
+XOBJS=	l1_afunc.o l1_async.o l1_cmplx.o l1_init.o l1_pwmgr.o
 
 all:	${IOBJS} ${XOBJS}
 
--- a/gsm-fw/L1/cfile/l1_pwmgr.c	Fri Aug 08 05:32:56 2014 +0000
+++ b/gsm-fw/L1/cfile/l1_pwmgr.c	Fri Aug 08 07:35:35 2014 +0000
@@ -210,6 +210,7 @@
   #include "l1_trace.h"
   #include "../../bsp/timer.h"
 
+  #include "l1_pwmgr.h"
 
   #if (CHIPSET == 12) || (CHIPSET == 15)
     #include "timer/timer_sec.h"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gsm-fw/L1/include/l1_pwmgr.h	Fri Aug 08 07:35:35 2014 +0000
@@ -0,0 +1,28 @@
+/*
+ * This header file appears in the LoCosto version, but not in Leonardo.
+ * The version of this file in the LoCosto source was full of LoCosto
+ * specifics, so originally I planned on omitting it in FreeCalypso.
+ * However, some of the C modules make use of some of the definitions
+ * here no matter what CHIPSET, so I'm including a stripped-down version
+ * that has all LoCosto-isms removed, but retains the needed definitions.
+ */
+
+#ifndef __L1_PWMGR_H__
+#define __L1_PWMGR_H__
+
+  #define FAIL_SLEEP_PERIPH_CHECK   1 /* When initial Check_Peripheral_App */
+  #define FAIL_SLEEP_OSTIMERGAUGE   2 /* When checking for Osload, HWtimer or min_time_gauging */
+  #define FAIL_SLEEP_PERIPH_SLEEP   3 /* When the peripherals are put to sleep */
+  #define FAIL_SLEEP_L1SYNCH        4 /* Failed at l1s_synch level itself */
+
+  #define FAIL_SLEEP_DUE_TO_OSLOAD  0
+  #define FAIL_SLEEP_DUE_TO_HWTIMER 1
+  #define FAIL_SLEEP_DUE_TO_MINTIMEGAUGING 2
+
+  typedef struct
+  {
+    UWORD8  fail_id;
+    UWORD8  fail_ret_val;
+  }T_PWMGR_DEBUG;
+
+#endif