# HG changeset patch
# User Mychaela Falconia <falcon@freecalypso.org>
# Date 1476029297 0
# Node ID c93a236e0d50b2b0b7e5641823200f41371736b0
# Parent  05aa9659f6d69d3c96a133c644e47aa720d6cd29
PWR SWE compiles

diff -r 05aa9659f6d6 -r c93a236e0d50 components/pwr
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/pwr	Sun Oct 09 16:08:17 2016 +0000
@@ -0,0 +1,45 @@
+# Building pwr.lib
+
+CFLAGS="-mn -mt -o -x -mw -me -pw2"
+CPPFLAGS="-DTOOL_CHOICE=0 -D_TMS470"
+
+# Includes
+
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/os/nucleus"
+CPPFLAGS="$CPPFLAGS -I.."
+CPPFLAGS="$CPPFLAGS -I../config"
+CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/frame/cust_os"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera/rv"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/abb"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/armio"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/clkm"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/conf"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/dma"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/dsp_dwnld"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/inth"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/memif"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/rhea"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/security"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/spi"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/timer"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/uart"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/ulpd"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_app"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/services"
+
+# Source modules
+
+SRCDIR=$SRC/cs/drivers/drv_app/pwr
+
+cfile_plain $SRCDIR/pwr_api.c
+cfile_plain $SRCDIR/pwr_cust.c
+cfile_plain $SRCDIR/pwr_disch.c
+cfile_plain $SRCDIR/pwr_liion_cha.c
+cfile_plain $SRCDIR/pwr_messages.c
+cfile_plain $SRCDIR/pwr_messages_i.c
+cfile_plain $SRCDIR/pwr_process.c
+cfile_plain $SRCDIR/pwr_env.c
diff -r 05aa9659f6d6 -r c93a236e0d50 src/cs/drivers/drv_app/pwr/pwr_api.c
--- a/src/cs/drivers/drv_app/pwr/pwr_api.c	Sun Oct 09 15:17:19 2016 +0000
+++ b/src/cs/drivers/drv_app/pwr/pwr_api.c	Sun Oct 09 16:08:17 2016 +0000
@@ -12,17 +12,17 @@
  *
  ******************************************************************************/
 
-#include "rv_defined_swe.h"	   // for RVM_PWR_SWE
+#include "rv/rv_defined_swe.h"	   // for RVM_PWR_SWE
 
 #ifdef RVM_PWR_SWE
 
-#include "rvm_use_id_list.h"
-#include "spi_api.h"
-#include "spi_env.h"
-#include "pwr_env.h"
-#include "pwr_cust.h"
-#include "pwr_messages.h"
-#include "pwr_messages_i.h"
+#include "rvm/rvm_use_id_list.h"
+#include "spi/spi_api.h"
+#include "spi/spi_env.h"
+#include "pwr/pwr_env.h"
+#include "pwr/pwr_cust.h"
+#include "pwr/pwr_messages.h"
+#include "pwr/pwr_messages_i.h"
 
 /* Define a pointer to the PWR Environment control block.   */
 extern T_PWR_ENV_CTRL_BLK *pwr_env_ctrl_blk;
diff -r 05aa9659f6d6 -r c93a236e0d50 src/cs/drivers/drv_app/pwr/pwr_api.h
--- a/src/cs/drivers/drv_app/pwr/pwr_api.h	Sun Oct 09 15:17:19 2016 +0000
+++ b/src/cs/drivers/drv_app/pwr/pwr_api.h	Sun Oct 09 16:08:17 2016 +0000
@@ -14,7 +14,7 @@
 #ifndef __PWR_API_H__
 #define __PWR_API_H__
 
-#include "rv_general.h"
+#include "rv/rv_general.h"
 
 typedef T_RV_RET T_POWER_RET;
 
diff -r 05aa9659f6d6 -r c93a236e0d50 src/cs/drivers/drv_app/pwr/pwr_cust.c
--- a/src/cs/drivers/drv_app/pwr/pwr_cust.c	Sun Oct 09 15:17:19 2016 +0000
+++ b/src/cs/drivers/drv_app/pwr/pwr_cust.c	Sun Oct 09 16:08:17 2016 +0000
@@ -12,21 +12,21 @@
  *
  ******************************************************************************/
 
-#include "rv_defined_swe.h"	   // for RVM_PWR_SWE
+#include "rv/rv_defined_swe.h"	   // for RVM_PWR_SWE
 
 #ifdef RVM_PWR_SWE
 
-#include "abb.h"
-#include "rvm_use_id_list.h"
-#include "pwr_messages.h"
-#include "rvf_api.h"
-#include "pwr_cust.h"
-#include "pwr_env.h"
-#include "pwr_analog_dev.h"
-#include "spi_env.h"
-#include "spi_task.h"
-#include "pwr_liion_cha.h"
-#include "pwr_disch.h"
+#include "abb/abb.h"
+#include "rvm/rvm_use_id_list.h"
+#include "pwr/pwr_messages.h"
+#include "rvf/rvf_api.h"
+#include "pwr/pwr_cust.h"
+#include "pwr/pwr_env.h"
+#include "pwr/pwr_analog_dev.h"
+#include "spi/spi_env.h"
+#include "spi/spi_task.h"
+#include "pwr/pwr_liion_cha.h"
+#include "pwr/pwr_disch.h"
 
 /* Caution: keep ascending order in the temperature arrays !!! */
 
diff -r 05aa9659f6d6 -r c93a236e0d50 src/cs/drivers/drv_app/pwr/pwr_cust.h
--- a/src/cs/drivers/drv_app/pwr/pwr_cust.h	Sun Oct 09 15:17:19 2016 +0000
+++ b/src/cs/drivers/drv_app/pwr/pwr_cust.h	Sun Oct 09 16:08:17 2016 +0000
@@ -15,7 +15,7 @@
 #ifndef __PWR_CUST_H__
 #define __PWR_CUST_H__
 
-#include "pwr_api.h"
+#include "pwr/pwr_api.h"
 
 
 /* Constants relative to the battery type */
diff -r 05aa9659f6d6 -r c93a236e0d50 src/cs/drivers/drv_app/pwr/pwr_disch.c
--- a/src/cs/drivers/drv_app/pwr/pwr_disch.c	Sun Oct 09 15:17:19 2016 +0000
+++ b/src/cs/drivers/drv_app/pwr/pwr_disch.c	Sun Oct 09 16:08:17 2016 +0000
@@ -8,19 +8,19 @@
  *
  ******************************************************************************/
 
-#include "rv_defined_swe.h"	   // for RVM_PWR_SWE
+#include "rv/rv_defined_swe.h"	   // for RVM_PWR_SWE
 
 #ifdef RVM_PWR_SWE
 
-#include "abb.h"
-#include "rvm_use_id_list.h"
-#include "pwr_disch.h"
-#include "power.h"
-#include "spi_task.h"
-#include "pwr_cust.h"
-#include "pwr_messages.h"
-#include "spi_env.h"
-#include "pwr_env.h"
+#include "abb/abb.h"
+#include "rvm/rvm_use_id_list.h"
+#include "pwr/pwr_disch.h"
+#include "power/power.h"
+#include "spi/spi_task.h"
+#include "pwr/pwr_cust.h"
+#include "pwr/pwr_messages.h"
+#include "spi/spi_env.h"
+#include "pwr/pwr_env.h"
 
 /* Define a pointer to the PWR Environment control block.  */
 extern T_PWR_ENV_CTRL_BLK *pwr_env_ctrl_blk;
diff -r 05aa9659f6d6 -r c93a236e0d50 src/cs/drivers/drv_app/pwr/pwr_env.c
--- a/src/cs/drivers/drv_app/pwr/pwr_env.c	Sun Oct 09 15:17:19 2016 +0000
+++ b/src/cs/drivers/drv_app/pwr/pwr_env.c	Sun Oct 09 16:08:17 2016 +0000
@@ -16,17 +16,17 @@
 /* (C) Copyright 2000 by Texas Instruments Incorporated, All Rights Reserved */
 /*****************************************************************************/
 
-#include "rv_defined_swe.h"	   // for RVM_PWR_SWE
+#include "rv/rv_defined_swe.h"	   // for RVM_PWR_SWE
 
 #ifdef RVM_PWR_SWE
 
-#include "rvm_priorities.h"
-#include "rvm_api.h"
-#include "pwr_env.h"
-#include "spi_env.h"
-#include "pwr_cust.h"
-#include "pwr_analog_dev.h"
-#include "rvm_use_id_list.h"
+#include "rvm/rvm_priorities.h"
+#include "rvm/rvm_api.h"
+#include "pwr/pwr_env.h"
+#include "spi/spi_env.h"
+#include "pwr/pwr_cust.h"
+#include "pwr/pwr_analog_dev.h"
+#include "rvm/rvm_use_id_list.h"
 #include <string.h>
 
 /* Define a pointer to the PWR environment control block */
diff -r 05aa9659f6d6 -r c93a236e0d50 src/cs/drivers/drv_app/pwr/pwr_env.h
--- a/src/cs/drivers/drv_app/pwr/pwr_env.h	Sun Oct 09 15:17:19 2016 +0000
+++ b/src/cs/drivers/drv_app/pwr/pwr_env.h	Sun Oct 09 16:08:17 2016 +0000
@@ -19,17 +19,17 @@
 #ifndef __PWR_ENV_H__
 #define __PWR_ENV_H__
 
-#include "rvm_gen.h"
-#include "pwr_api.h"
+#include "rvm/rvm_gen.h"
+#include "pwr/pwr_api.h"
 
-#include "pwr_cust.h"
+#include "pwr/pwr_cust.h"
 
-#include "rvf_pool_size.h"	/* Stack & Memory Bank sizes definitions */
+#include "pwr/pwr_pool_size.h"	/* Stack & Memory Bank sizes definitions */
 
 #define PWR_MAILBOX_USED   RVF_TASK_MBOX_1
 
 /* memory bank size and watermark */
-#define PWR_MB_PRIM_SIZE            RVF_PWR_MB1_SIZE
+#define PWR_MB_PRIM_SIZE            PWR_MB1_SIZE
 
 #define PWR_MB_PRIM_WATERMARK     (PWR_MB_PRIM_SIZE - 200)
 
diff -r 05aa9659f6d6 -r c93a236e0d50 src/cs/drivers/drv_app/pwr/pwr_liion_cha.c
--- a/src/cs/drivers/drv_app/pwr/pwr_liion_cha.c	Sun Oct 09 15:17:19 2016 +0000
+++ b/src/cs/drivers/drv_app/pwr/pwr_liion_cha.c	Sun Oct 09 16:08:17 2016 +0000
@@ -12,20 +12,20 @@
  *
  ******************************************************************************/
 
-#include "rv_defined_swe.h"	   // for RVM_PWR_SWE
+#include "rv/rv_defined_swe.h"	   // for RVM_PWR_SWE
 
 #ifdef RVM_PWR_SWE
 
-#include "rvm_use_id_list.h"
-#include "spi_task.h"
-#include "spi_api.h"
-#include "pwr_cust.h"
-#include "pwr_liion_cha.h"
-#include "pwr_disch.h"
-#include "spi_env.h"
-#include "rvf_api.h"
-#include "pwr_analog_dev.h"
-#include "pwr_messages.h"
+#include "rvm/rvm_use_id_list.h"
+#include "spi/spi_task.h"
+#include "spi/spi_api.h"
+#include "pwr/pwr_cust.h"
+#include "pwr/pwr_liion_cha.h"
+#include "pwr/pwr_disch.h"
+#include "spi/spi_env.h"
+#include "rvf/rvf_api.h"
+#include "pwr/pwr_analog_dev.h"
+#include "pwr/pwr_messages.h"
 
 /* Global variable */
 extern T_SPI_GBL_INFO *SPI_GBL_INFO_PTR;
diff -r 05aa9659f6d6 -r c93a236e0d50 src/cs/drivers/drv_app/pwr/pwr_messages.c
--- a/src/cs/drivers/drv_app/pwr/pwr_messages.c	Sun Oct 09 15:17:19 2016 +0000
+++ b/src/cs/drivers/drv_app/pwr/pwr_messages.c	Sun Oct 09 16:08:17 2016 +0000
@@ -11,15 +11,15 @@
  *
  ******************************************************************************/
 
-#include "rv_defined_swe.h"	   // for RVM_PWR_SWE
+#include "rv/rv_defined_swe.h"	   // for RVM_PWR_SWE
 
 #ifdef RVM_PWR_SWE
 
-#include "rvm_use_id_list.h"
-#include "rvf_api.h"
-#include "pwr_messages.h"
-#include "rv_general.h"
-#include "spi_env.h"
+#include "rvm/rvm_use_id_list.h"
+#include "rvf/rvf_api.h"
+#include "pwr/pwr_messages.h"
+#include "rv/rv_general.h"
+#include "spi/spi_env.h"
 
 
 
diff -r 05aa9659f6d6 -r c93a236e0d50 src/cs/drivers/drv_app/pwr/pwr_messages.h
--- a/src/cs/drivers/drv_app/pwr/pwr_messages.h	Sun Oct 09 15:17:19 2016 +0000
+++ b/src/cs/drivers/drv_app/pwr/pwr_messages.h	Sun Oct 09 16:08:17 2016 +0000
@@ -14,10 +14,10 @@
 #ifndef __PWR_MESSAGES_H__
 #define __PWR_MESSAGES_H__
 
-#include "rv_general.h"
-#include "pwr_api.h"
-#include "pwr_env.h"
-#include "spi_api.h"
+#include "rv/rv_general.h"
+#include "pwr/pwr_api.h"
+#include "pwr/pwr_env.h"
+#include "spi/spi_api.h"
 
 typedef struct
 {
diff -r 05aa9659f6d6 -r c93a236e0d50 src/cs/drivers/drv_app/pwr/pwr_messages_i.c
--- a/src/cs/drivers/drv_app/pwr/pwr_messages_i.c	Sun Oct 09 15:17:19 2016 +0000
+++ b/src/cs/drivers/drv_app/pwr/pwr_messages_i.c	Sun Oct 09 16:08:17 2016 +0000
@@ -11,15 +11,15 @@
  *
  ******************************************************************************/
 
-#include "rv_defined_swe.h"	   // for RVM_PWR_SWE
+#include "rv/rv_defined_swe.h"	   // for RVM_PWR_SWE
 
 #ifdef RVM_PWR_SWE
 
-#include "rvm_use_id_list.h"
-#include "rvf_api.h"
-#include "pwr_messages_i.h"
-#include "pwr_env.h"
-#include "spi_env.h"
+#include "rvm/rvm_use_id_list.h"
+#include "rvf/rvf_api.h"
+#include "pwr/pwr_messages_i.h"
+#include "pwr/pwr_env.h"
+#include "spi/spi_env.h"
 
 
 /********************************************************************************/
diff -r 05aa9659f6d6 -r c93a236e0d50 src/cs/drivers/drv_app/pwr/pwr_messages_i.h
--- a/src/cs/drivers/drv_app/pwr/pwr_messages_i.h	Sun Oct 09 15:17:19 2016 +0000
+++ b/src/cs/drivers/drv_app/pwr/pwr_messages_i.h	Sun Oct 09 16:08:17 2016 +0000
@@ -13,9 +13,9 @@
 #ifndef __PWR_MESSAGES_I_H__
 #define __PWR_MESSAGES_I_H__
 
-#include "rv_general.h"
-#include "pwr_api.h"
-#include "spi_api.h"
+#include "rv/rv_general.h"
+#include "pwr/pwr_api.h"
+#include "spi/spi_api.h"
 
 
 
diff -r 05aa9659f6d6 -r c93a236e0d50 src/cs/drivers/drv_app/pwr/pwr_process.c
--- a/src/cs/drivers/drv_app/pwr/pwr_process.c	Sun Oct 09 15:17:19 2016 +0000
+++ b/src/cs/drivers/drv_app/pwr/pwr_process.c	Sun Oct 09 16:08:17 2016 +0000
@@ -15,15 +15,15 @@
 /* (C) Copyright 2000 by Texas Instruments Incorporated, All Rights Reserved */
 /*****************************************************************************/
 
-#include "rv_defined_swe.h"	   // for RVM_PWR_SWE
+#include "rv/rv_defined_swe.h"	   // for RVM_PWR_SWE
 
 #ifdef RVM_PWR_SWE
 
-#include "abb.h"
-#include "rvm_use_id_list.h"
-#include "rvf_api.h"
-#include "pwr_messages_i.h"
-#include "spi_env.h"
+#include "abb/abb.h"
+#include "rvm/rvm_use_id_list.h"
+#include "rvf/rvf_api.h"
+#include "pwr/pwr_messages_i.h"
+#include "spi/spi_env.h"
 
 
 /*******************************************************************************