diff options
Diffstat (limited to 'software/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c')
-rw-r--r-- | software/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c index 49de3f5..d45b5a0 100644 --- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c +++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c @@ -23,9 +23,9 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.02.04 $ +$Octasic_Release: OCT612xAPI-01.03.00 $ -$Octasic_Revision: 91 $ +$Octasic_Revision: 97 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -60,6 +60,8 @@ $Octasic_Revision: 91 $ #include "oct6100_events_priv.h" #include "oct6100_interrupts_priv.h" #include "oct6100_channel_priv.h" +#include "oct6100_tsst_priv.h" +#include "oct6100_memory_priv.h" /**************************** PUBLIC FUNCTIONS *****************************/ @@ -87,6 +89,7 @@ UINT32 Oct6100InterruptConfigureDef( f_pIntrptConfig->ulErrorMemoryConfig = cOCT6100_INTERRUPT_NO_TIMEOUT; + f_pIntrptConfig->ulErrorOverflowToneEventsConfig = cOCT6100_INTERRUPT_NO_TIMEOUT; f_pIntrptConfig->ulErrorH100Config = cOCT6100_INTERRUPT_NO_TIMEOUT; @@ -167,6 +170,7 @@ UINT32 Oct6100InterruptServiceRoutineDef( f_pIntFlags->fErrorPllJitter = FALSE; + f_pIntFlags->fErrorOverflowToneEvents = FALSE; @@ -273,6 +277,8 @@ UINT32 Oct6100ApiIsrSwInit( pSharedInfo->IntrptManage.fAfBistFailedOnBoot = FALSE; + + /* The ISR has never been called. */ pSharedInfo->IntrptManage.fIsrCalled = FALSE; @@ -395,6 +401,7 @@ UINT32 Oct6100InterruptConfigureSer( f_pIntrptConfig->ulErrorMemoryConfig != cOCT6100_INTERRUPT_NO_TIMEOUT ) return cOCT6100_ERR_INTRPTS_DATA_ERR_MEMORY_CONFIG; + if ( f_pIntrptConfig->ulErrorOverflowToneEventsConfig != cOCT6100_INTERRUPT_DISABLE && f_pIntrptConfig->ulErrorOverflowToneEventsConfig != cOCT6100_INTERRUPT_TIMEOUT && f_pIntrptConfig->ulErrorOverflowToneEventsConfig != cOCT6100_INTERRUPT_NO_TIMEOUT ) @@ -426,6 +433,7 @@ UINT32 Oct6100InterruptConfigureSer( pIntrptConfig->byFatalMemoryConfig = (UINT8)( f_pIntrptConfig->ulFatalMemoryConfig & 0xFF ); pIntrptConfig->byErrorMemoryConfig = (UINT8)( f_pIntrptConfig->ulErrorMemoryConfig & 0xFF ); + pIntrptConfig->byErrorOverflowToneEventsConfig = (UINT8)( f_pIntrptConfig->ulErrorOverflowToneEventsConfig & 0xFF ); pIntrptConfig->byErrorH100Config = (UINT8)( f_pIntrptConfig->ulErrorH100Config & 0xFF ); @@ -656,6 +664,7 @@ UINT32 Oct6100InterruptServiceRoutineSer( + f_pIntFlags->fErrorH100OutOfSync = FALSE; f_pIntFlags->fErrorH100ClkA = FALSE; f_pIntFlags->fErrorH100ClkB = FALSE; @@ -736,6 +745,8 @@ UINT32 Oct6100InterruptServiceRoutineSer( if ( ulResult != cOCT6100_ERR_OK ) return ulResult; + + /* Write to the necessary IE registers. */ ulResult = Oct6100ApiWriteIntrptRegs( f_pApiInstance ); if ( ulResult != cOCT6100_ERR_OK ) @@ -1818,10 +1829,8 @@ UINT32 Oct6100ApiCheckProcessorState( UINT32 ulAfTimestamp; UINT32 ulTimestampDiff; UINT32 ulMafWPnt; - UINT32 ulResult; UINT32 i; - UINT16 usReadData; UINT16 ausReadData[ 2 ]; @@ -2072,8 +2081,8 @@ UINT32 Oct6100ApiCheckProcessorState( - return cOCT6100_ERR_OK; } + |