xpp: oct612x: fix build warnings
authorTzafrir Cohen <tzafrir.cohen@xorcom.com>
Mon, 19 Mar 2012 16:45:40 +0000 (16:45 +0000)
committerTzafrir Cohen <tzafrir.cohen@xorcom.com>
Mon, 19 Mar 2012 16:45:40 +0000 (16:45 +0000)
git-svn-id: http://svn.astersk.org/svn/dahdi/tools/trunk@10542 17933a7a-c749-41c5-a318-cba88f637d49

xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c
xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c
xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c
xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c
xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.c
xpp/oct612x/octdeviceapi/oct6100api/oct6100_miscellaneous_priv.h

index caefd6e..2a9f940 100644 (file)
@@ -1500,7 +1500,6 @@ UINT32 Oct6100ApiReserveChannelResources(
                                IN  tPOCT6100_CHANNEL_OPEN                              f_pChannelOpen,
                                OUT tPOCT6100_API_ECHO_CHAN_INDEX               f_pChanIndexConf )
 {
-       tPOCT6100_SHARED_INFO                   pSharedInfo;
        tPOCT6100_CHANNEL_OPEN_TDM              pTdmConfig;
        tPOCT6100_CHANNEL_OPEN_CODEC    pCodecConfig;
 
@@ -1526,9 +1525,6 @@ UINT32 Oct6100ApiReserveChannelResources(
        BOOL    fExtToneChanEntry       = FALSE;
        BOOL    fExtToneTsiEntry        = FALSE;
        BOOL    fExtToneMixerEntry      = FALSE;
-       
-       /* Obtain local pointer to shared portion of instance. */
-       pSharedInfo = f_pApiInstance->pSharedInfo;
 
        /* Obtain a local pointer to the configuration structures.*/
        pTdmConfig              = &f_pChannelOpen->TdmConfig;
@@ -1951,7 +1947,6 @@ UINT32 Oct6100ApiWriteChannelStructs(
        UINT32  ulResult;
        UINT32  ulDwordAddress;
        UINT32  ulDwordData;
-       BOOL    fConversionEnabled = FALSE;
        BOOL    fProgramAdpcmMem;
        UINT32  ulCompType = 0;
        UINT32  ulPcmLaw;
@@ -2036,62 +2031,50 @@ UINT32 Oct6100ApiWriteChannelStructs(
                        break;
                case cOCT6100_G726_40KBPS:                              
                        ulCompType = 0x3;               
-                       fConversionEnabled = TRUE;
                        break;
 
                case cOCT6100_G726_32KBPS:                              
                        ulCompType = 0x2;               
-                       fConversionEnabled = TRUE;
                        break;
 
                case cOCT6100_G726_24KBPS:                              
                        ulCompType = 0x1;               
-                       fConversionEnabled = TRUE;
                        break;
 
                case cOCT6100_G726_16KBPS:                              
                        ulCompType = 0x0;               
-                       fConversionEnabled = TRUE;
                        break;          
 
                case cOCT6100_G727_2C_ENCODED:                  
                        ulCompType = 0x4;               
-                       fConversionEnabled = TRUE;
                        break;
 
                case cOCT6100_G727_3C_ENCODED:                  
                        ulCompType = 0x5;               
-                       fConversionEnabled = TRUE;
                        break;
 
                case cOCT6100_G727_4C_ENCODED:                  
                        ulCompType = 0x6;               
-                       fConversionEnabled = TRUE;
                        break;
 
                case cOCT6100_G726_ENCODED:                             
                        ulCompType = 0x9;               
-                       fConversionEnabled = TRUE;
                        break;
 
                case cOCT6100_G711_G726_ENCODED:                
                        ulCompType = 0xA;               
-                       fConversionEnabled = TRUE;
                        break;
 
                case cOCT6100_G711_G727_2C_ENCODED:             
                        ulCompType = 0xC;               
-                       fConversionEnabled = TRUE;
                        break;
 
                case cOCT6100_G711_G727_3C_ENCODED:             
                        ulCompType = 0xD;               
-                       fConversionEnabled = TRUE;
                        break;
 
                case cOCT6100_G711_G727_4C_ENCODED:             
                        ulCompType = 0xE;               
-                       fConversionEnabled = TRUE;
                        break;
                default:
                        return cOCT6100_ERR_FATAL_D4;
@@ -2182,67 +2165,54 @@ UINT32 Oct6100ApiWriteChannelStructs(
                        break;
                case cOCT6100_G726_40KBPS:                              
                        ulCompType = 0x3;               
-                       fConversionEnabled = TRUE;
                        break;
 
                case cOCT6100_G726_32KBPS:                              
                        ulCompType = 0x2;               
-                       fConversionEnabled = TRUE;
                        break;
 
                case cOCT6100_G726_24KBPS:                              
                        ulCompType = 0x1;               
-                       fConversionEnabled = TRUE;
                        break;
 
                case cOCT6100_G726_16KBPS:                              
                        ulCompType = 0x0;               
-                       fConversionEnabled = TRUE;
                        break;          
 
                case cOCT6100_G727_40KBPS_4_1:                  
                        ulCompType = 0xD;               
-                       fConversionEnabled = TRUE;
                        break;
 
                case cOCT6100_G727_40KBPS_3_2:                  
                        ulCompType = 0xA;               
-                       fConversionEnabled = TRUE;
                        break;
 
                case cOCT6100_G727_40KBPS_2_3:                  
                        ulCompType = 0x6;               
-                       fConversionEnabled = TRUE;
                        break;
 
                case cOCT6100_G727_32KBPS_4_0:                  
                        ulCompType = 0xE;               
-                       fConversionEnabled = TRUE;
                        break;
 
                case cOCT6100_G727_32KBPS_3_1:                  
                        ulCompType = 0xB;               
-                       fConversionEnabled = TRUE;
                        break;
 
                case cOCT6100_G727_32KBPS_2_2:                  
                        ulCompType = 0x7;               
-                       fConversionEnabled = TRUE;
                        break;
 
                case cOCT6100_G727_24KBPS_3_0:                  
                        ulCompType = 0xC;               
-                       fConversionEnabled = TRUE;
                        break;
 
                case cOCT6100_G727_24KBPS_2_1:                  
                        ulCompType = 0x8;               
-                       fConversionEnabled = TRUE;
                        break;
 
                case cOCT6100_G727_16KBPS_2_0:                  
                        ulCompType = 0x9;               
-                       fConversionEnabled = TRUE;
                        break;
 
                default:
@@ -3807,10 +3777,8 @@ UINT32 Oct6100ApiCheckChannelModify(
        /* Check the TDM config.*/
        if ( f_pChannelModify->fTdmConfigModified == TRUE )
        {
-               tPOCT6100_CHANNEL_MODIFY_TDM            pModifyTdm;
                tPOCT6100_CHANNEL_OPEN_TDM                      pOpenTdm;
 
-               pModifyTdm = &f_pChannelModify->TdmConfig;
                pOpenTdm = &f_pTempChanOpen->TdmConfig;
 
                ulResult = Oct6100ApiCheckTdmConfig( f_pApiInstance,
@@ -4706,7 +4674,6 @@ UINT32 Oct6100ApiModifyChannelStructs(
        tOCT6100_WRITE_PARAMS   WriteParams;
        tPOCT6100_API_CHANNEL_CODEC     pApiCodecConf;
        tPOCT6100_API_CHANNEL_TDM       pApiTdmConf;
-       tPOCT6100_API_CHANNEL_VQE       pApiVqeConf;
 
        UINT32  ulResult;
        UINT16  usReadData;
@@ -4717,8 +4684,6 @@ UINT32 Oct6100ApiModifyChannelStructs(
        UINT32  ulToneConfIndex;
        BOOL    fClearPlayoutPointers = FALSE;
 
-       BOOL    fConversionEnabled = FALSE;
-
 
 
        /* Obtain local pointer to shared portion of instance. */
@@ -4740,7 +4705,6 @@ UINT32 Oct6100ApiModifyChannelStructs(
        /* Obtain local pointer to the configuration structures of the tPOCT6100_API_CHANNEL structure. */
        pApiCodecConf = &pChanEntry->CodecConfig;
        pApiTdmConf   = &pChanEntry->TdmConfig;
-       pApiVqeConf   = &pChanEntry->VqeConfig;
 
        /*=======================================================================*/
        /* Init the RIN and SIN TSST index */
@@ -5090,62 +5054,50 @@ UINT32 Oct6100ApiModifyChannelStructs(
                                break;
                        case cOCT6100_G726_40KBPS:                              
                                ulCompType = 0x3;               
-                               fConversionEnabled = TRUE;
                                break;
 
                        case cOCT6100_G726_32KBPS:                              
                                ulCompType = 0x2;               
-                               fConversionEnabled = TRUE;
                                break;
 
                        case cOCT6100_G726_24KBPS:                              
                                ulCompType = 0x1;               
-                               fConversionEnabled = TRUE;
                                break;
 
                        case cOCT6100_G726_16KBPS:                              
                                ulCompType = 0x0;               
-                               fConversionEnabled = TRUE;
                                break;          
 
                        case cOCT6100_G727_2C_ENCODED:                  
                                ulCompType = 0x4;               
-                               fConversionEnabled = TRUE;
                                break;
 
                        case cOCT6100_G727_3C_ENCODED:                  
                                ulCompType = 0x5;               
-                               fConversionEnabled = TRUE;
                                break;
 
                        case cOCT6100_G727_4C_ENCODED:                  
                                ulCompType = 0x6;               
-                               fConversionEnabled = TRUE;
                                break;
 
                        case cOCT6100_G726_ENCODED:                             
                                ulCompType = 0x9;               
-                               fConversionEnabled = TRUE;
                                break;
 
                        case cOCT6100_G711_G726_ENCODED:                
                                ulCompType = 0xA;               
-                               fConversionEnabled = TRUE;
                                break;
 
                        case cOCT6100_G711_G727_2C_ENCODED:             
                                ulCompType = 0xC;               
-                               fConversionEnabled = TRUE;
                                break;
 
                        case cOCT6100_G711_G727_3C_ENCODED:             
                                ulCompType = 0xD;               
-                               fConversionEnabled = TRUE;
                                break;
 
                        case cOCT6100_G711_G727_4C_ENCODED:             
                                ulCompType = 0xE;               
-                               fConversionEnabled = TRUE;
                                break;
 
                        default:
@@ -5262,67 +5214,54 @@ UINT32 Oct6100ApiModifyChannelStructs(
                                        break;
                                case cOCT6100_G726_40KBPS:                              
                                        ulCompType = 0x3;               
-                                       fConversionEnabled = TRUE;
                                        break;
 
                                case cOCT6100_G726_32KBPS:                              
                                        ulCompType = 0x2;               
-                                       fConversionEnabled = TRUE;
                                        break;
 
                                case cOCT6100_G726_24KBPS:                              
                                        ulCompType = 0x1;               
-                                       fConversionEnabled = TRUE;
                                        break;
 
                                case cOCT6100_G726_16KBPS:                              
                                        ulCompType = 0x0;               
-                                       fConversionEnabled = TRUE;
                                        break;          
 
                                case cOCT6100_G727_40KBPS_4_1:                  
                                        ulCompType = 0xD;               
-                                       fConversionEnabled = TRUE;
                                        break;
 
                                case cOCT6100_G727_40KBPS_3_2:                  
                                        ulCompType = 0xA;               
-                                       fConversionEnabled = TRUE;
                                        break;
 
                                case cOCT6100_G727_40KBPS_2_3:                  
                                        ulCompType = 0x6;               
-                                       fConversionEnabled = TRUE;
                                        break;
 
                                case cOCT6100_G727_32KBPS_4_0:                  
                                        ulCompType = 0xE;               
-                                       fConversionEnabled = TRUE;
                                        break;
 
                                case cOCT6100_G727_32KBPS_3_1:                  
                                        ulCompType = 0xB;               
-                                       fConversionEnabled = TRUE;
                                        break;
 
                                case cOCT6100_G727_32KBPS_2_2:                  
                                        ulCompType = 0x7;               
-                                       fConversionEnabled = TRUE;
                                        break;
 
                                case cOCT6100_G727_24KBPS_3_0:                  
                                        ulCompType = 0xC;               
-                                       fConversionEnabled = TRUE;
                                        break;
 
                                case cOCT6100_G727_24KBPS_2_1:                  
                                        ulCompType = 0x8;               
-                                       fConversionEnabled = TRUE;
                                        break;
 
                                case cOCT6100_G727_16KBPS_2_0:                  
                                        ulCompType = 0x9;               
-                                       fConversionEnabled = TRUE;
                                        break;
 
                                default:
@@ -8885,7 +8824,6 @@ UINT32 Oct6100ApiWriteVqeNlpMemory(
 {
        tPOCT6100_API_CHANNEL                   pChanEntry;
        tPOCT6100_SHARED_INFO                   pSharedInfo;
-       tOCT6100_WRITE_PARAMS                   WriteParams;
        tOCT6100_BUFFER_PLAYOUT_STOP    BufferPlayoutStop;
        UINT32                                                  ulResult;
        UINT32                                                  ulTempData;
@@ -8899,10 +8837,6 @@ UINT32 Oct6100ApiWriteVqeNlpMemory(
        
        pSharedInfo = f_pApiInstance->pSharedInfo;
 
-       WriteParams.pProcessContext = f_pApiInstance->pProcessContext;
-
-       WriteParams.ulUserChipId = pSharedInfo->ChipConfig.ulUserChipId;
-
        /* Obtain a pointer to the new buffer's list entry. */
        mOCT6100_GET_CHANNEL_ENTRY_PNT( pSharedInfo, pChanEntry, f_usChanIndex );
 
@@ -9856,7 +9790,6 @@ UINT32 Oct6100ApiWriteVqeAfMemory(
 {
        tPOCT6100_API_CHANNEL                   pChanEntry;
        tPOCT6100_SHARED_INFO                   pSharedInfo;
-       tOCT6100_WRITE_PARAMS                   WriteParams;
        UINT32                                                  ulResult;
        UINT32                                                  ulTempData;
        UINT32                                                  ulAfConfigBaseAddress;
@@ -9868,10 +9801,6 @@ UINT32 Oct6100ApiWriteVqeAfMemory(
        
        pSharedInfo = f_pApiInstance->pSharedInfo;
 
-       WriteParams.pProcessContext = f_pApiInstance->pProcessContext;
-
-       WriteParams.ulUserChipId = pSharedInfo->ChipConfig.ulUserChipId;
-
        /* Obtain a pointer to the new buffer's list entry. */
        mOCT6100_GET_CHANNEL_ENTRY_PNT( pSharedInfo, pChanEntry, f_usChanIndex );
 
@@ -12338,12 +12267,8 @@ UINT32 Oct6100ApiWriteDebugChanMemory(
                                IN      UINT16                                                  f_usRinRoutTsiIndex,
                                IN      UINT16                                                  f_usSinSoutTsiIndex )
 {
-       tPOCT6100_SHARED_INFO   pSharedInfo;
        UINT32                                  ulResult;
 
-       /* Obtain pointer to local portion of the instance. */
-       pSharedInfo = f_pApiInstance->pSharedInfo;
-
        /*==============================================================================*/
        /* Write the VQE configuration of the debug channel. */
 
index 819ac84..0303688 100644 (file)
@@ -3569,9 +3569,7 @@ UINT32 Oct6100ApiBootSdram(
        tPOCT6100_SHARED_INFO           pSharedInfo;
        tPOCT6100_API_CHIP_CONFIG       pChipConfig;
        tOCT6100_WRITE_PARAMS           WriteParams;
-       tOCT6100_READ_PARAMS            ReadParams;
        UINT32  ulResult;
-       UINT16  usReadData;
        UINT16  usWriteData23E;
        UINT16  usWriteData230;
        UINT32  i;
@@ -3587,11 +3585,6 @@ UINT32 Oct6100ApiBootSdram(
 
        WriteParams.ulUserChipId = pSharedInfo->ChipConfig.ulUserChipId;
 
-       ReadParams.pProcessContext = f_pApiInstance->pProcessContext;
-
-       ReadParams.ulUserChipId = pSharedInfo->ChipConfig.ulUserChipId;
-       ReadParams.pusReadData = &usReadData;
-
        usWriteData23E = 0x0000;
        usWriteData230 = 0x0000;
 
@@ -4995,7 +4988,6 @@ UINT32 Oct6100ApiRunEgo(
                                OUT             PUINT32                                                 f_aulEntry )
 {
        tPOCT6100_SHARED_INFO           pSharedInfo;
-       tPOCT6100_API_CHIP_CONFIG       pChipConfig;
        tOCT6100_WRITE_PARAMS           WriteParams;
        tOCT6100_READ_PARAMS            ReadParams;
        UINT32  ulResult;
@@ -5008,9 +5000,6 @@ UINT32 Oct6100ApiRunEgo(
        /* Get local pointer to shared portion of instance. */
        pSharedInfo = f_pApiInstance->pSharedInfo;
 
-       /* Get local pointer to the chip configuration structure. */
-       pChipConfig = &f_pApiInstance->pSharedInfo->ChipConfig;
-
        /* Set the process context and user chip ID parameters once and for all. */
        WriteParams.pProcessContext = f_pApiInstance->pProcessContext;
 
@@ -5210,7 +5199,6 @@ UINT32 Oct6100ApiInitChannels(
        tPOCT6100_SHARED_INFO           pSharedInfo;
        UINT32 i;
        UINT32 ulResult;
-       tOCT6100_WRITE_BURST_PARAMS     BurstParams;
        tOCT6100_WRITE_PARAMS           WriteParams;
        tOCT6100_READ_PARAMS            ReadParams;
        UINT16                                          usReadData;
@@ -5220,7 +5208,6 @@ UINT32 Oct6100ApiInitChannels(
        UINT32                                          ulFeatureBitOffset;
        UINT32                                          ulFeatureFieldLength;
        UINT32                                          ulMask;
-       UINT16                                          ausWriteData[ 4 ];
        UINT16                                          usLoopCount = 0;
        UINT16                                          usWriteData = 0;
        UINT16                                          usMclkRead;
@@ -5235,11 +5222,6 @@ UINT32 Oct6100ApiInitChannels(
 
        WriteParams.ulUserChipId = f_pApiInstance->pSharedInfo->ChipConfig.ulUserChipId;
 
-       BurstParams.pProcessContext = f_pApiInstance->pProcessContext;
-
-       BurstParams.ulUserChipId = f_pApiInstance->pSharedInfo->ChipConfig.ulUserChipId;
-       BurstParams.pusWriteData = ausWriteData;
-
        ReadParams.pProcessContext = f_pApiInstance->pProcessContext;
 
        ReadParams.ulUserChipId = f_pApiInstance->pSharedInfo->ChipConfig.ulUserChipId;
index 1fc539e..1b279d6 100644 (file)
@@ -2893,7 +2893,6 @@ UINT32    Oct6100ApiBridgeAddParticipantToChannel(
        tPOCT6100_API_CHANNEL                           pSourceChanEntry;
        tPOCT6100_API_CHANNEL                           pDestinationChanEntry;
 
-       tPOCT6100_API_FLEX_CONF_PARTICIPANT     pSourceParticipant;
        tPOCT6100_API_FLEX_CONF_PARTICIPANT     pDestinationParticipant;
 
        tPOCT6100_SHARED_INFO                   pSharedInfo;
@@ -2914,7 +2913,6 @@ UINT32    Oct6100ApiBridgeAddParticipantToChannel(
        mOCT6100_GET_CONF_BRIDGE_ENTRY_PNT( f_pApiInstance->pSharedInfo, pBridgeEntry, f_usBridgeIndex );
 
        mOCT6100_GET_CHANNEL_ENTRY_PNT( f_pApiInstance->pSharedInfo, pSourceChanEntry, f_usSourceChannelIndex );
-       mOCT6100_GET_FLEX_CONF_PARTICIPANT_ENTRY_PNT( f_pApiInstance->pSharedInfo, pSourceParticipant, pSourceChanEntry->usFlexConfParticipantIndex );
        mOCT6100_GET_CHANNEL_ENTRY_PNT( f_pApiInstance->pSharedInfo, pDestinationChanEntry, f_usDestinationChannelIndex );
        mOCT6100_GET_FLEX_CONF_PARTICIPANT_ENTRY_PNT( f_pApiInstance->pSharedInfo, pDestinationParticipant, pDestinationChanEntry->usFlexConfParticipantIndex );
 
@@ -5069,12 +5067,9 @@ UINT32 Oct6100ApiBridgeRemoveParticipantFromChannel(
        tPOCT6100_API_MIXER_EVENT                       pTempEntry;
        tPOCT6100_API_MIXER_EVENT                       pLoadTempEntry;
        tPOCT6100_API_MIXER_EVENT                       pLastEventEntry;
-       tPOCT6100_API_MIXER_EVENT                       pLastLoadOrAccumulateEventEntry;
 
-       tPOCT6100_API_CHANNEL                           pSourceChanEntry;
        tPOCT6100_API_CHANNEL                           pDestinationChanEntry;
 
-       tPOCT6100_API_FLEX_CONF_PARTICIPANT     pSourceParticipant;
        tPOCT6100_API_FLEX_CONF_PARTICIPANT     pDestinationParticipant;
 
        tPOCT6100_SHARED_INFO                           pSharedInfo;
@@ -5083,7 +5078,6 @@ UINT32 Oct6100ApiBridgeRemoveParticipantFromChannel(
 
        UINT32                                                          ulResult;
        UINT32                                                          ulLoopCount;
-       UINT16                                                          usLastLoadEventIndex;
        UINT16                                                          usLoadOrAccumulateEventIndex;
        UINT16                                                          usTempEventIndex;
        UINT16                                                          usPreviousEventIndex;
@@ -5091,7 +5085,6 @@ UINT32 Oct6100ApiBridgeRemoveParticipantFromChannel(
 
        UINT16                                                          usReadData;
        BOOL                                                            fLastEvent = FALSE;
-       BOOL                                                            fSoutCopyEvent = FALSE;
 
        /* Obtain local pointer to shared portion of instance. */
        pSharedInfo = f_pApiInstance->pSharedInfo;
@@ -5107,8 +5100,6 @@ UINT32 Oct6100ApiBridgeRemoveParticipantFromChannel(
 
        mOCT6100_GET_CONF_BRIDGE_ENTRY_PNT( f_pApiInstance->pSharedInfo, pBridgeEntry, f_usBridgeIndex );
 
-       mOCT6100_GET_CHANNEL_ENTRY_PNT( f_pApiInstance->pSharedInfo, pSourceChanEntry, f_usSourceChannelIndex );
-       mOCT6100_GET_FLEX_CONF_PARTICIPANT_ENTRY_PNT( f_pApiInstance->pSharedInfo, pSourceParticipant, pSourceChanEntry->usFlexConfParticipantIndex );
        mOCT6100_GET_CHANNEL_ENTRY_PNT( f_pApiInstance->pSharedInfo, pDestinationChanEntry, f_usDestinationChannelIndex );
        mOCT6100_GET_FLEX_CONF_PARTICIPANT_ENTRY_PNT( f_pApiInstance->pSharedInfo, pDestinationParticipant, pDestinationChanEntry->usFlexConfParticipantIndex );
 
@@ -5127,8 +5118,6 @@ UINT32 Oct6100ApiBridgeRemoveParticipantFromChannel(
                mOCT6100_GET_MIXER_EVENT_ENTRY_PNT( pSharedInfo, pTempEntry, usTempEventIndex );
 
                pLastEventEntry = pLoadEventEntry;
-               pLastLoadOrAccumulateEventEntry = pLoadEventEntry;
-               usLastLoadEventIndex = usTempEventIndex;
                usLastEventIndex = usTempEventIndex;
 
                while( pTempEntry->usEventType != cOCT6100_MIXER_CONTROL_MEM_SUB_STORE && 
@@ -5224,9 +5213,6 @@ UINT32 Oct6100ApiBridgeRemoveParticipantFromChannel(
                                }
                        }
 
-                       pLastLoadOrAccumulateEventEntry = pTempEntry;
-                       usLastLoadEventIndex = usTempEventIndex;
-
                        /* Go to the next entry into the list. */
                        usTempEventIndex = pTempEntry->usNextEventPtr;
                        mOCT6100_GET_MIXER_EVENT_ENTRY_PNT( pSharedInfo, pTempEntry, usTempEventIndex );
@@ -5362,7 +5348,6 @@ UINT32 Oct6100ApiBridgeRemoveParticipantFromChannel(
                        if ( pTempEntry->usEventType == cOCT6100_MIXER_CONTROL_MEM_COPY )
                        {
                                /* No more previous bridges. */
-                               fSoutCopyEvent = TRUE;
                        }
 
                        /* Now modify the previous last Store or Sub-Store or Head-Node event from another bridge/channel. */
@@ -7412,7 +7397,6 @@ UINT32 Oct6100ApiGetPrevLastSubStoreEvent(
                                IN              UINT16                                                  f_usBridgeFirstLoadEventPtr,
                                OUT             PUINT16                                                 f_pusLastSubStoreEventIndex )
 {
-       tPOCT6100_API_CONF_BRIDGE       pBridgeEntry;
        tPOCT6100_API_MIXER_EVENT       pTempMixerEntry;
        UINT16                                          usNextEventPtr;
        UINT16                                          usHeadEventPtr;
@@ -7421,9 +7405,6 @@ UINT32 Oct6100ApiGetPrevLastSubStoreEvent(
        UINT16                                          usCurrentPtr;
        UINT32                                          ulResult = cOCT6100_ERR_OK;
 
-       /* Get current entry to obtain the link to the previous entry.*/
-       mOCT6100_GET_CONF_BRIDGE_ENTRY_PNT( f_pApiInstance->pSharedInfo, pBridgeEntry, f_usBridgeIndex );
-
        /* Since we have flexible bridges, we have to */
        /* run down the list and check for the appropriate event. */
 
index 58a7194..898267d 100644 (file)
@@ -798,7 +798,6 @@ UINT32 Oct6100ApiReadIntrptRegs(
        tPOCT6100_API_CHIP_ERROR_STATS  pErrorStats;
        tPOCT6100_API_INTRPT_MANAGE             pIntrptManage;
        tOCT6100_READ_PARAMS                    ReadParams;
-       tOCT6100_WRITE_PARAMS                   WriteParams;
 
        UINT32  ulResult;
        UINT16  usReadData;
@@ -820,13 +819,6 @@ UINT32 Oct6100ApiReadIntrptRegs(
        ReadParams.ulUserChipId = pSharedInfo->ChipConfig.ulUserChipId;
        ReadParams.pusReadData = &usReadData;
 
-       /* Set some parameters of write struct. */
-       WriteParams.pProcessContext = f_pApiInstance->pProcessContext;
-
-       WriteParams.ulUserChipId = pSharedInfo->ChipConfig.ulUserChipId;
-
-
-
        /* CPU registers. */
        if ( (f_ulRegister210h & 0x00001) != 0 )
        {
@@ -1296,7 +1288,6 @@ UINT32 Oct6100ApiWriteIeRegs(
 {
        tPOCT6100_API_INTRPT_MANAGE     pIntrptManage;
        tOCT6100_WRITE_PARAMS           WriteParams;
-       tOCT6100_READ_PARAMS            ReadParams;
        UINT32  ulResult;
 
        /* Get some local pointers. */
@@ -1307,12 +1298,6 @@ UINT32 Oct6100ApiWriteIeRegs(
 
        WriteParams.ulUserChipId = f_pApiInstance->pSharedInfo->ChipConfig.ulUserChipId;
 
-
-       /* Set some parameters of read struct. */
-       ReadParams.pProcessContext = f_pApiInstance->pProcessContext;
-
-       ReadParams.ulUserChipId = f_pApiInstance->pSharedInfo->ChipConfig.ulUserChipId;
-       
        /*==================================================================================*/
        WriteParams.ulWriteAddress = 0x104;
        WriteParams.usWriteData = 0x0000;
index 02fbd8f..d3235a1 100644 (file)
@@ -175,12 +175,9 @@ UINT32 Oct6100ApiValidateTsst(
 {
        tPOCT6100_SHARED_INFO           pSharedInfo;
        tPOCT6100_API_CHIP_CONFIG       pChipConfig;    
-       PUINT32                                         pulTsstAlloc;
        
        /* Obtain local pointer to shared portion of instance. */
        pSharedInfo = f_pApiInstance->pSharedInfo;
-       
-       mOCT6100_GET_TSST_ALLOC_PNT( f_pApiInstance->pSharedInfo, pulTsstAlloc );
 
        /* Obtain local pointer to chip configuration. */
        pChipConfig = &pSharedInfo->ChipConfig;
index c0381f4..70d2fc0 100644 (file)
@@ -84,14 +84,12 @@ $Octasic_Revision: 20 $
 {                                                                                                                                                              \
        PVOID   _pProcessContext;                                                                                                       \
        UINT32  _ulUserChipId;                                                                                                          \
-       UINT32  _ulWriteAddress;                                                                                                        \
        UINT16  _usWriteData;                                                                                                           \
        UINT32  _ulWriteLength;                                                                                                         \
                                                                                                                                                                \
        /* Store the data that is to be passed to the user. */                                          \
        _pProcessContext = SmearParams.pProcessContext;                                                         \
        _ulUserChipId = SmearParams.ulUserChipId;                                                                       \
-       _ulWriteAddress = SmearParams.ulWriteAddress;                                                           \
        _usWriteData = SmearParams.usWriteData;                                                                         \
        _ulWriteLength = SmearParams.ulWriteLength;                                                                     \
                                                                                                                                                                \