FreeCalypso > hg > freecalypso-sw

changeset 149:971e84124a6f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gsm-fw/bsp/abb+spi: preening of header files, first pass
author Michael Spacefalcon <msokolov@ivan.Harhan.ORG>
date Sat, 16 Nov 2013 19:41:30 +0000
parents 63750f70796d
children 3c850b416c9a
files gsm-fw/bsp/abb+spi/abb.h gsm-fw/bsp/abb+spi/abb_core_inth.h gsm-fw/bsp/abb+spi/abb_inline.h gsm-fw/bsp/abb+spi/abb_inth.h gsm-fw/bsp/abb+spi/spi_api.h gsm-fw/bsp/abb+spi/spi_drv.h gsm-fw/bsp/abb+spi/spi_env.h gsm-fw/bsp/abb+spi/spi_process.h gsm-fw/bsp/abb+spi/spi_task.h gsm-fw/riviera/rvf/rvf_pool_size.h
diffstat 10 files changed, 46 insertions(+), 81 deletions(-) [+]
line wrap: on
line diff
--- a/gsm-fw/bsp/abb+spi/abb.h	Sat Nov 16 19:03:37 2013 +0000
+++ b/gsm-fw/bsp/abb+spi/abb.h	Sat Nov 16 19:41:30 2013 +0000
@@ -30,36 +30,24 @@
 #ifndef __ABB_H__
 #define __ABB_H__
 
-#include "l1sw.cfg"
-
-#if (OP_L1_STANDALONE == 0)
-  #include "main/sys_types.h"
-#else
-  #include "sys_types.h"
-#endif
-
+#include "../../include/config.h"
+#include "../../include/sys_types.h"
 
 #ifndef _WINDOWS
 
-
-#include "chipset.cfg"
-
-
-
-
 /*------------------------------------*/
 /* SYREN PG Definition                */
 /*------------------------------------*/
 
-#if (ANLG_FAM == 3)   // SYREN
+#if (ANALOG == 3)   // SYREN
     #define S_PG_10      1
     #define S_PG_20      2
-#endif  // (ANLG_FAM == 3)
+#endif  // (ANALOG == 3)
 
 
 
 // DEFINITIONS FOR OMEGA/NAUSICA
-#if (ANLG_FAM == 1)
+#if (ANALOG == 1)
   // ABB PAGE
   #define PAGE0	0x0001
   #define PAGE1	0x0002
@@ -187,7 +175,7 @@
 
 
 // DEFINITIONS FOR IOTA
-#elif (ANLG_FAM == 2)
+#elif (ANALOG == 2)
   // ABB PAGE
   #define PAGE0	0x0001
   #define PAGE1	0x0002
@@ -354,7 +342,7 @@
 
 
 // DEFINITIONS FOR SYREN
-#elif (ANLG_FAM == 3)
+#elif (ANALOG == 3)
 
   // ABB PAGE
   #define PAGE0	0x0001
@@ -549,7 +537,7 @@
   #define MAIN_BG        0x01,
   #define SLEEP_BG       0x00
 
-#endif	  // ANLG_FAM == 1,2,3
+#endif	  // ANALOG == 1,2,3
 
 
 // Define the level of semaphore protection for all accesses to the ABB
@@ -585,7 +573,7 @@
 #if (OP_L1_STANDALONE == 0)
 void ABB_Power_Off(void);
 #endif
-#if (ANLG_FAM ==3)
+#if (ANALOG ==3)
   void Syren_Sleep_Config(SYS_UWORD16 sleep_type,SYS_UWORD16 bg_select, SYS_UWORD16 sleep_delay);
 #endif
 
--- a/gsm-fw/bsp/abb+spi/abb_core_inth.h	Sat Nov 16 19:03:37 2013 +0000
+++ b/gsm-fw/bsp/abb+spi/abb_core_inth.h	Sat Nov 16 19:41:30 2013 +0000
@@ -36,24 +36,17 @@
 #ifndef __ABB_CORE_INTH_H__
 #define __ABB_CORE_INTH_H__
 
-  #include "l1sw.cfg"
-
-  #if (OP_L1_STANDALONE == 0)
-    #include "main/sys_types.h"
-  #else
-    #include "sys_types.h"
-  #endif
+  #include "../../include/config.h"
+  #include "../../include/sys_types.h"
 
   #ifndef _WINDOWS
 
-    #include "chipset.cfg"
-  
     // Structure definition for ADC READING RESULT REPORTS
     // Define the maximum number of measures performed by the MADC module
-    #if ((ANLG_FAM == 1) || (ANLG_FAM == 3))
+    #if ((ANALOG == 1) || (ANALOG == 3))
       #define MADC_NUMBER_OF_MEAS  (9)
     #endif
-    #if (ANLG_FAM == 2)
+    #if (ANALOG == 2)
       #define MADC_NUMBER_OF_MEAS  (8)
     #endif
   
--- a/gsm-fw/bsp/abb+spi/abb_inline.h	Sat Nov 16 19:03:37 2013 +0000
+++ b/gsm-fw/bsp/abb+spi/abb_inline.h	Sat Nov 16 19:41:30 2013 +0000
@@ -29,15 +29,10 @@
 #ifndef __ABB_INLINE_H__
 #define __ABB_INLINE_H__
 
-#include "l1sw.cfg"
+#include "../../include/config.h"
+#include "../../include/sys_types.h"
 
-#if (OP_L1_STANDALONE == 0)
-  #include "main/sys_types.h"
-#else
-  #include "sys_types.h"
-#endif
-
-#include "spi/spi_drv.h"
+#include "spi_drv.h"
 
 // MACROS
 #define ABB_WRITE_REG(reg, data) { \
--- a/gsm-fw/bsp/abb+spi/abb_inth.h	Sat Nov 16 19:03:37 2013 +0000
+++ b/gsm-fw/bsp/abb+spi/abb_inth.h	Sat Nov 16 19:41:30 2013 +0000
@@ -37,14 +37,10 @@
 #ifndef __ABB_INTH_H__
 #define __ABB_INTH_H__
 
-  #include "main/sys_types.h"
-  #include "abb/abb_core_inth.h" 
+  #include "abb_core_inth.h" 
 
   #ifndef _WINDOWS
 
-    #include "l1sw.cfg"
-    #include "chipset.cfg"
-  
     /****************************************************************/
     /* Power ON/OFF key definition.                                 */
     /****************************************************************/
--- a/gsm-fw/bsp/abb+spi/spi_api.h	Sat Nov 16 19:03:37 2013 +0000
+++ b/gsm-fw/bsp/abb+spi/spi_api.h	Sat Nov 16 19:41:30 2013 +0000
@@ -18,9 +18,9 @@
 #ifndef __SPI_API_H_
 #define __SPI_API_H_
 
+#include "../../riviera/rv/rv_general.h"
 
-#include "rv/rv_general.h"
-#include "abb/abb.h"
+#include "abb.h"
 
 #ifdef __cplusplus
 extern "C"
@@ -45,32 +45,32 @@
 /* structures of messages send to SPI	 */
 /*****************************************/
 
-typedef struct
-{  T_RV_HDR     os_hdr;
-   UINT16		page;
-   UINT16		address;
-   UINT16       data;
+typedef struct {
+	T_RV_HDR	os_hdr;
+	UINT16		page;
+	UINT16		address;
+	UINT16		data;
 } T_SPI_WRITE;
 
 
-typedef struct
-{  T_RV_HDR     os_hdr;
-   UINT16		page;
-   UINT16		address;
+typedef struct {
+	T_RV_HDR	os_hdr;
+	UINT16		page;
+	UINT16		address;
 } T_SPI_READ;
 
 
-typedef struct
-{  T_RV_HDR     os_hdr;
-   UINT16		channels;
-   UINT16		itval;
+typedef struct {
+	T_RV_HDR	os_hdr;
+	UINT16		channels;
+	UINT16		itval;
 } T_SPI_ABB_CONF_ADC;
 
 
-typedef struct
-{  T_RV_HDR               os_hdr;
-   UINT16                 *Buff;
-   CALLBACK_FUNC_NO_PARAM callback_func;
+typedef struct {
+	T_RV_HDR               os_hdr;
+	UINT16                 *Buff;
+	CALLBACK_FUNC_NO_PARAM callback_func;
 } T_SPI_ABB_READ_ADC;
 
 
@@ -175,4 +175,3 @@
 T_RV_RET spi_abb_read_ADC(UINT16 *Buff, CALLBACK_FUNC_NO_PARAM CallBack);
 
 #endif /* __SPI_API_H_ */
-
--- a/gsm-fw/bsp/abb+spi/spi_drv.h	Sat Nov 16 19:03:37 2013 +0000
+++ b/gsm-fw/bsp/abb+spi/spi_drv.h	Sat Nov 16 19:41:30 2013 +0000
@@ -43,15 +43,10 @@
 #ifndef __SPI_DRV_H__
 #define __SPI_DRV_H__
 
-#include "l1sw.cfg"
-#include "chipset.cfg"
+#include "../../include/config.h"
+#include "../../include/sys_types.h"
 
-#include "memif/mem.h" 
-#if (OP_L1_STANDALONE == 0)
-  #include "main/sys_types.h"
-#else
-  #include "sys_types.h"
-#endif
+#include "../mem.h" 
 
 // SPI module registers definition
 #define SPI_REG_SET1	(MEM_SPI + 0x00)
--- a/gsm-fw/bsp/abb+spi/spi_env.h	Sat Nov 16 19:03:37 2013 +0000
+++ b/gsm-fw/bsp/abb+spi/spi_env.h	Sat Nov 16 19:41:30 2013 +0000
@@ -19,10 +19,10 @@
 #ifndef __SPI_ENV_H_
 #define __SPI_ENV_H_
 
-#include "rvm/rvm_gen.h"
-#include "abb/abb_inth.h"	 // for MADC_NUMBER_OF_MEAS
+#include "../../riviera/rvm/rvm_gen.h"
+#include "abb_inth.h"	 // for MADC_NUMBER_OF_MEAS
 
-#include "spi/spi_pool_size.h"	/* Stack & Memory Bank sizes definitions */
+#include "spi_pool_size.h"	/* Stack & Memory Bank sizes definitions */
 
 /* SPI mailbox */
 #define SPI_MAILBOX                 RVF_TASK_MBOX_0
@@ -69,4 +69,3 @@
 T_RVM_RETURN spi_kill (void);
 
 #endif /*__SPI_ENV_H_*/
-
--- a/gsm-fw/bsp/abb+spi/spi_process.h	Sat Nov 16 19:03:37 2013 +0000
+++ b/gsm-fw/bsp/abb+spi/spi_process.h	Sat Nov 16 19:41:30 2013 +0000
@@ -36,4 +36,4 @@
 *******************************************************************************/
 UINT8 spi_process(T_RV_HDR * msg_ptr);
 
-#endif /* __SPI_PROCESS_H__ */
\ No newline at end of file
+#endif /* __SPI_PROCESS_H__ */
--- a/gsm-fw/bsp/abb+spi/spi_task.h	Sat Nov 16 19:03:37 2013 +0000
+++ b/gsm-fw/bsp/abb+spi/spi_task.h	Sat Nov 16 19:41:30 2013 +0000
@@ -20,7 +20,7 @@
 #ifndef _SPI_TASK_H_
 #define _SPI_TASK_H_
 
-#include "rv/rv_defined_swe.h"	   // for RVM_PWR_SWE
+#include "../../riviera/rv/rv_defined_swe.h"	   // for RVM_PWR_SWE
 
 #ifdef RVM_PWR_SWE
 
@@ -53,4 +53,4 @@
 void spi_adc_on (void);
 T_RV_RET spi_core(void);
 
-#endif	// _SPI_TASK_H_
\ No newline at end of file
+#endif	// _SPI_TASK_H_
--- a/gsm-fw/riviera/rvf/rvf_pool_size.h	Sat Nov 16 19:03:37 2013 +0000
+++ b/gsm-fw/riviera/rvf/rvf_pool_size.h	Sat Nov 16 19:41:30 2013 +0000
@@ -430,7 +430,7 @@
  * SPI SWE
  */
 #ifdef RVM_SPI_SWE
-  #include "spi/spi_pool_size.h"
+  #include "../../bsp/abb+spi/spi_pool_size.h"
   #define RVF_SPI_POOL_SIZE  (SPI_POOL_SIZE)
 #else
   #define RVF_SPI_POOL_SIZE  (0)