[dahdi-commits] tzafrir: branch tools/2.5 r10545 - in /tools/branches/2.5/xpp/oct612x/octdevi...
SVN commits to the DAHDI project
dahdi-commits at lists.digium.com
Tue Mar 20 00:54:36 CDT 2012
Author: tzafrir
Date: Tue Mar 20 00:54:32 2012
New Revision: 10545
URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10545
Log:
xpp: oct612x: fix build warnings
Signed-off-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=10542
Modified:
tools/branches/2.5/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c
tools/branches/2.5/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c
tools/branches/2.5/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c
tools/branches/2.5/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c
tools/branches/2.5/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.c
tools/branches/2.5/xpp/oct612x/octdeviceapi/oct6100api/oct6100_miscellaneous_priv.h
Modified: tools/branches/2.5/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c
URL: http://svnview.digium.com/svn/dahdi/tools/branches/2.5/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c?view=diff&rev=10545&r1=10544&r2=10545
==============================================================================
--- tools/branches/2.5/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c (original)
+++ tools/branches/2.5/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c Tue Mar 20 00:54:32 2012
@@ -1500,7 +1500,6 @@
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 @@
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 ulResult;
UINT32 ulDwordAddress;
UINT32 ulDwordData;
- BOOL fConversionEnabled = FALSE;
BOOL fProgramAdpcmMem;
UINT32 ulCompType = 0;
UINT32 ulPcmLaw;
@@ -2036,62 +2031,50 @@
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 @@
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 @@
/* 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 @@
tOCT6100_WRITE_PARAMS WriteParams;
tPOCT6100_API_CHANNEL_CODEC pApiCodecConf;
tPOCT6100_API_CHANNEL_TDM pApiTdmConf;
- tPOCT6100_API_CHANNEL_VQE pApiVqeConf;
UINT32 ulResult;
UINT16 usReadData;
@@ -4716,8 +4683,6 @@
UINT32 ulToneConfIndex;
BOOL fClearPlayoutPointers = FALSE;
-
- BOOL fConversionEnabled = FALSE;
@@ -4740,7 +4705,6 @@
/* 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 @@
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 @@
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 @@
{
tPOCT6100_API_CHANNEL pChanEntry;
tPOCT6100_SHARED_INFO pSharedInfo;
- tOCT6100_WRITE_PARAMS WriteParams;
tOCT6100_BUFFER_PLAYOUT_STOP BufferPlayoutStop;
UINT32 ulResult;
UINT32 ulTempData;
@@ -8898,10 +8836,6 @@
BOOL fEchoOperationModeChanged;
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 @@
{
tPOCT6100_API_CHANNEL pChanEntry;
tPOCT6100_SHARED_INFO pSharedInfo;
- tOCT6100_WRITE_PARAMS WriteParams;
UINT32 ulResult;
UINT32 ulTempData;
UINT32 ulAfConfigBaseAddress;
@@ -9867,10 +9800,6 @@
UINT16 usTempData;
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,11 +12267,7 @@
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. */
Modified: tools/branches/2.5/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c
URL: http://svnview.digium.com/svn/dahdi/tools/branches/2.5/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c?view=diff&rev=10545&r1=10544&r2=10545
==============================================================================
--- tools/branches/2.5/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c (original)
+++ tools/branches/2.5/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c Tue Mar 20 00:54:32 2012
@@ -3569,9 +3569,7 @@
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;
@@ -3586,11 +3584,6 @@
WriteParams.pProcessContext = f_pApiInstance->pProcessContext;
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 @@
OUT PUINT32 f_aulEntry )
{
tPOCT6100_SHARED_INFO pSharedInfo;
- tPOCT6100_API_CHIP_CONFIG pChipConfig;
tOCT6100_WRITE_PARAMS WriteParams;
tOCT6100_READ_PARAMS ReadParams;
UINT32 ulResult;
@@ -5007,9 +4999,6 @@
/* 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 @@
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 ulFeatureBitOffset;
UINT32 ulFeatureFieldLength;
UINT32 ulMask;
- UINT16 ausWriteData[ 4 ];
UINT16 usLoopCount = 0;
UINT16 usWriteData = 0;
UINT16 usMclkRead;
@@ -5234,11 +5221,6 @@
WriteParams.pProcessContext = f_pApiInstance->pProcessContext;
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;
Modified: tools/branches/2.5/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c
URL: http://svnview.digium.com/svn/dahdi/tools/branches/2.5/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c?view=diff&rev=10545&r1=10544&r2=10545
==============================================================================
--- tools/branches/2.5/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c (original)
+++ tools/branches/2.5/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c Tue Mar 20 00:54:32 2012
@@ -2893,7 +2893,6 @@
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 @@
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 @@
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 ulResult;
UINT32 ulLoopCount;
- UINT16 usLastLoadEventIndex;
UINT16 usLoadOrAccumulateEventIndex;
UINT16 usTempEventIndex;
UINT16 usPreviousEventIndex;
@@ -5091,7 +5085,6 @@
UINT16 usReadData;
BOOL fLastEvent = FALSE;
- BOOL fSoutCopyEvent = FALSE;
/* Obtain local pointer to shared portion of instance. */
pSharedInfo = f_pApiInstance->pSharedInfo;
@@ -5107,8 +5100,6 @@
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 @@
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 @@
}
}
- 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 @@
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 @@
IN UINT16 f_usBridgeFirstLoadEventPtr,
OUT PUINT16 f_pusLastSubStoreEventIndex )
{
- tPOCT6100_API_CONF_BRIDGE pBridgeEntry;
tPOCT6100_API_MIXER_EVENT pTempMixerEntry;
UINT16 usNextEventPtr;
UINT16 usHeadEventPtr;
@@ -7420,9 +7404,6 @@
UINT32 ulLoopCount = 0;
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. */
Modified: tools/branches/2.5/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c
URL: http://svnview.digium.com/svn/dahdi/tools/branches/2.5/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c?view=diff&rev=10545&r1=10544&r2=10545
==============================================================================
--- tools/branches/2.5/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c (original)
+++ tools/branches/2.5/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c Tue Mar 20 00:54:32 2012
@@ -798,7 +798,6 @@
tPOCT6100_API_CHIP_ERROR_STATS pErrorStats;
tPOCT6100_API_INTRPT_MANAGE pIntrptManage;
tOCT6100_READ_PARAMS ReadParams;
- tOCT6100_WRITE_PARAMS WriteParams;
UINT32 ulResult;
UINT16 usReadData;
@@ -819,13 +818,6 @@
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 @@
{
tPOCT6100_API_INTRPT_MANAGE pIntrptManage;
tOCT6100_WRITE_PARAMS WriteParams;
- tOCT6100_READ_PARAMS ReadParams;
UINT32 ulResult;
/* Get some local pointers. */
@@ -1307,12 +1298,6 @@
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;
Modified: tools/branches/2.5/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.c
URL: http://svnview.digium.com/svn/dahdi/tools/branches/2.5/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.c?view=diff&rev=10545&r1=10544&r2=10545
==============================================================================
--- tools/branches/2.5/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.c (original)
+++ tools/branches/2.5/xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.c Tue Mar 20 00:54:32 2012
@@ -175,12 +175,9 @@
{
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;
Modified: tools/branches/2.5/xpp/oct612x/octdeviceapi/oct6100api/oct6100_miscellaneous_priv.h
URL: http://svnview.digium.com/svn/dahdi/tools/branches/2.5/xpp/oct612x/octdeviceapi/oct6100api/oct6100_miscellaneous_priv.h?view=diff&rev=10545&r1=10544&r2=10545
==============================================================================
--- tools/branches/2.5/xpp/oct612x/octdeviceapi/oct6100api/oct6100_miscellaneous_priv.h (original)
+++ tools/branches/2.5/xpp/oct612x/octdeviceapi/oct6100api/oct6100_miscellaneous_priv.h Tue Mar 20 00:54:32 2012
@@ -84,14 +84,12 @@
{ \
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; \
\
More information about the dahdi-commits
mailing list