3 files changed, 34 insertions, 23 deletions

diff --git a/example/apps/icssg_pwm/firmware/src/iepPwm.c b/example/apps/icssg_pwm/firmware/src/iepPwm.c
index 91e091b..db7e62f 100644
--- a/example/apps/icssg_pwm/firmware/src/iepPwm.c
+++ b/example/apps/icssg_pwm/firmware/src/iepPwm.c
@@ -32,8 +32,7 @@
  */
 
 #include <string.h>
-#include <ti/csl/tistdtypes.h>
-#include <ti/csl/hw_types.h>
+#include <ti/csl/soc.h>
 #include "icssg_iep_pwm.h"
 #include "iepPwmFwRegs.h"
 #include "iepPwmHwRegs.h"
@@ -552,7 +551,9 @@ static Int32 updateIepPwmCmpxShRegDb(
     IcssgIepPwmObj *pIcssgIepPwmObj
 );
 
+#ifdef TX_HOST_INT
 volatile register uint32_t __R31;
+#endif
 
 /* ------------------------------------------------------------------------- *
  * External Functions                                                        *
@@ -737,9 +738,6 @@ Int32 initIepPwm(
 
         /* Clear reconfiguration flags whether set or not */
         pIepPwmFwRegs->IEP_PWM_RECFG = 0;
-        
-        /* Enable IEP Counter */
-        pIcssgIepPwmObj->pIepHwRegs->GLOBAL_CFG_REG |= 0x1;
     }
          
     return status;
@@ -789,6 +787,9 @@ void initIepPwmSm(
 )
 {
     pIcssgIepPwmObj->iepPwmState = IEP_SM_STATE_INIT;
+    
+    /* Enable IEP Counter */
+    pIcssgIepPwmObj->pIepHwRegs->GLOBAL_CFG_REG |= 0x1;
 }
 
 /* Execute IEP PWM State Machine */
@@ -1010,7 +1011,7 @@ static Int32 iepPwmConfigLhs(
     CSL_icss_g_pr1_iep1_slvRegs *pIepHwRegs = pIcssgIepPwmObj->pIepHwRegs;
     Uint16 iepPwmSnglEn;
     Uint8 iepPwmDiffEn;
-    Uint32 status = IEP_STS_NERR;
+    Int32 status = IEP_STS_NERR;
     
     /* Check for Host reconfiguration request.
        Host reconfiguration isn't allowed during Initialization. */
@@ -1114,7 +1115,7 @@ static Int32 iepPwmConfigRhs(
     IcssgIepPwmObj *pIcssgIepPwmObj
 )
 {
-    Uint32 status = IEP_STS_NERR;
+    Int32 status = IEP_STS_NERR;
     
     if (pIcssgIepPwmObj->iepPwmRhsRecfgFlag == TRUE) {
         /* Perform RHS Reconfiguration for pending Host reconfiguration */
@@ -1945,7 +1946,7 @@ static Int32 updateIepPwmCmpxShRegPwmEnDc(
     Uint32 iepPwmDcCountLhsNew, iepPwmDcCountRhsNew;
     Uint16 iepPwmSnglEn;
     Uint8 iepPwmDiffEn;
-    Uint32 status = IEP_STS_NERR;
+    Int32 status = IEP_STS_NERR;
  
     /* Get Duty Cycle reconfiguration */
     recfgDcCount = (pIepPwmFwRegs->IEP_PWM_RECFG & IEP_PWM_RECFG_RECFG_IEP_PWM_DC_COUNT_MASK) >> IEP_PWM_RECFG_RECFG_IEP_PWM_DC_COUNT_SHIFT;
@@ -2747,5 +2748,5 @@ static Int32 updateIepPwmCmpxShRegDb(
     /* Latch IEP PWM Deadband Count */
     latchIepPwmDbCount(pIcssgIepPwmObj, TRUE);
     
-    return 0;
+    return IEP_STS_NERR;
 }
diff --git a/example/apps/icssg_pwm/firmware/src/iepPwmFwRegs.c b/example/apps/icssg_pwm/firmware/src/iepPwmFwRegs.c
index cfcc3e0..a8e57ae 100644
--- a/example/apps/icssg_pwm/firmware/src/iepPwmFwRegs.c
+++ b/example/apps/icssg_pwm/firmware/src/iepPwmFwRegs.c
@@ -34,26 +34,36 @@
 #include <ti/csl/tistdtypes.h>
 #include "iepPwmFwRegs.h"
 
-#define DEF_PWM_RECFG   ( 0x00000000 )  /* Default no reconfiguration request */
+/* PWM Info defaults */
+#define DEF_FW_MAGIC_NUMBER         ( 0x4D575047 )  /* Firmware Magic Number - GPWM */
+#define DEF_FW_TYPE                 ( 0x00000000 )  /* Firmware Type - TBD */
+#define DEF_FW_VERSION              ( 0x00000000 )  /* Firmware Version - TBD */
+#define DEF_FW_FEATURE              ( 0x00001998 )  /* Firmware Feature - support for 24 PWMs, 12 IEP0 PWMs, 12 IEP1 PWMs */
+#define DEF_FW_EXTENDED_FEATURE     ( 0x00000000 )  /* Firmware Extended Feature - TBD */
 
-#define DEF_PWM_MODE    ( 0x00000000 )  /* Default all PWMs are Single-Ended */
-#define DEF_PWM_EN      ( 0x00000000 )  /* Default all PWMs are disabled */
+/* PWM control defaults */
+#define DEF_PWM_CTRL                ( 0x00000000 )  /* PWM control - IEP0 & IEP1 PWMs disabled */
+#define DEF_PWM_STAT                ( 0x00000000 )  /* PWM status - IEP0 & IEP1 PWM ACK disabled, FW initialization flag uninitialized */
+#define DEF_PWM_RECFG               ( 0x00000000 )  /* Default no reconfiguration request */
+
+#define DEF_PWM_MODE                ( 0x00000000 )  /* Default all PWMs are Single-Ended */
+#define DEF_PWM_EN                  ( 0x00000000 )  /* Default all PWMs are disabled */
 
 /* IEP clock @ 200 MHz */
-#define DEF_PRD_COUNT ( 0x0007A120 )    /* Default Period Count, PWM freq 1 kHz */
-#define DEF_DC_COUNT  ( 0x0007A120 )    /* Default DC Count, 50% Duty Cycle PWM freq 1 kHz */
-#define DEF_DB_COUNT  ( 0x0A00 )        /* Default DB Count, 2.56 usec. */
+#define DEF_PRD_COUNT               ( 0x0007A120 )  /* Default Period Count, PWM freq 1 kHz */
+#define DEF_DC_COUNT                ( 0x0007A120 )  /* Default DC Count, 50% Duty Cycle PWM freq 1 kHz */
+#define DEF_DB_COUNT                ( 0x0A00 )      /* Default DB Count, 2.56 usec. */
 
 /* FW Info register defaults */
 #pragma RETAIN(gIepPwmInfoFwRegs)
 #pragma DATA_SECTION(gIepPwmInfoFwRegs, ".initDataFwRegs")
 const IepPwmInfoFwRegs gIepPwmInfoFwRegs = 
 {
-    0x4D575047, /* FwMagicNumber - GPWM */
-    0x00000000, /* FwType - TBD */
-    0x00000000, /* FwVersion - TBD */
-    0x00001998, /* FwFeature */
-    0x00000000  /* FwExtendedFeature - Reserved for future use */
+    DEF_FW_MAGIC_NUMBER,    /* FwMagicNumber */
+    DEF_FW_TYPE,            /* FwType */
+    DEF_FW_VERSION,         /* FwVersion */
+    DEF_FW_FEATURE,         /* FwFeature */
+    DEF_FW_EXTENDED_FEATURE /* FwExtendedFeature - Reserved for future use */
 };
 
 /* FW PWM Control/Status register defaults */
@@ -61,8 +71,8 @@ const IepPwmInfoFwRegs gIepPwmInfoFwRegs =
 #pragma DATA_SECTION(gIepPwmCtrlFwRegs, ".initDataFwRegs")
 const IepPwmCtrlFwRegs gIepPwmCtrlFwRegs = 
 {
-    0x00000000, /* PWM_CTRL */
-    0x00000000  /* PWM_STAT */
+    DEF_PWM_CTRL,   /* PWM_CTRL */
+    DEF_PWM_STAT    /* PWM_STAT */
 };
 
 /* FW IEP0 PWM register defaults */
diff --git a/example/apps/icssg_pwm/firmware/src/main.c b/example/apps/icssg_pwm/firmware/src/main.c
index 6ad1af4..d0183b4 100644
--- a/example/apps/icssg_pwm/firmware/src/main.c
+++ b/example/apps/icssg_pwm/firmware/src/main.c
@@ -38,7 +38,7 @@
 
 void main(void)
 {
-    Uint32 status;
+    Int32 status;
     IepSm_Config iepSmConfig;
     
     /* Reset PWM FW control object */