[asterisk-scf-commits] team/sruffell/dahdi-linux.git branch "octapi" created.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Wed Feb 2 15:02:34 CST 2011
branch "octapi" has been created
at febf86f85998e229d6a4b7567b8d6c8f95b1ee6f (commit)
- Log -----------------------------------------------------------------
commit febf86f85998e229d6a4b7567b8d6c8f95b1ee6f
Author: Shaun Ruffell <sruffell at digium.com>
Date: Tue Feb 1 12:53:14 2011 -0600
wip
diff --git a/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c b/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c
index 49a876f..cdbd133 100644
--- a/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c
+++ b/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c
@@ -1154,6 +1154,8 @@ UINT32 Oct6100ApiGetChannelsEchoSwSizes(
if ( f_pOpenChip->fEnableChannelRecording == TRUE && ulMaxChannels != 672 )
ulMaxChannels++;
+ trace_printk("ulMaxChannels: %d sizeof(tOCT6100_API_CHANNEL):%d\n", ulMaxChannels, sizeof(tOCT6100_API_CHANNEL));
+
/* Determine the amount of memory required for the API echo channel list.*/
f_pInstSizes->ulChannelList = ulMaxChannels * sizeof( tOCT6100_API_CHANNEL ); /* Add one for the record channel.*/
f_pInstSizes->ulBiDirChannelList = f_pOpenChip->ulMaxBiDirChannels * sizeof( tOCT6100_API_BIDIR_CHANNEL );
commit 93732f847a5f974343ec04f0bbf97876603e642a
Author: Shaun Ruffell <sruffell at digium.com>
Date: Tue Feb 1 12:51:23 2011 -0600
wip: lower the max channel
diff --git a/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c b/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c
index 804101a..2942ddf 100644
--- a/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c
+++ b/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c
@@ -200,7 +200,7 @@ UINT32 Oct6100ChipOpenDef(
f_pChipOpen->fEnableAcousticEcho = FALSE;
/* Resource allocation parameters. */
- f_pChipOpen->ulMaxChannels = 672;
+ f_pChipOpen->ulMaxChannels = 256;
f_pChipOpen->ulMaxTsiCncts = 0;
f_pChipOpen->ulMaxBiDirChannels = 0;
f_pChipOpen->ulMaxConfBridges = 0;
commit d714728b14d77f9d3af1e77603bae899c09b867e
Author: Shaun Ruffell <sruffell at digium.com>
Date: Tue Feb 1 12:48:57 2011 -0600
wip
diff --git a/drivers/dahdi/oct612x/include/oct6100api/oct6100_defines.h b/drivers/dahdi/oct612x/include/oct6100api/oct6100_defines.h
index 0164c7f..9236682 100644
--- a/drivers/dahdi/oct612x/include/oct6100api/oct6100_defines.h
+++ b/drivers/dahdi/oct612x/include/oct6100api/oct6100_defines.h
@@ -474,14 +474,14 @@ $Octasic_Revision: 171 $
/* TSST defines.*/
#define cOCT6100_UNASSIGNED cOCT6100_FFFD
-#define cOCT6100_MAX_TSSTS 4096
+#define cOCT6100_MAX_TSSTS 512
#define cOCT6100_TWO_TSSTS_INDEX_MASK 0x8000
#define cOCT6100_TSST_INDEX_MASK 0x7FFF
#define cOCT6100_INPUT_TSST 0
#define cOCT6100_OUTPUT_TSST 1
/* Conference bridges defines.*/
-#define cOCT6100_MAX_MIXER_EVENTS 1344
+#define cOCT6100_MAX_MIXER_EVENTS 512
#define cOCT6100_MAX_FLEX_CONF_PARTICIPANTS_PER_BRIDGE 32
#define cOCT6100_CONF_DOMINANT_SPEAKER_UNASSIGNED 672
#define cOCT6100_CONF_NO_DOMINANT_SPEAKER_HNDL cOCT6100_FFFFFFFE
commit fa5f222445668c0b1a77aee20cde3c0e2c07fd84
Author: Shaun Ruffell <sruffell at digium.com>
Date: Tue Feb 1 12:47:34 2011 -0600
wip
diff --git a/drivers/dahdi/oct612x/include/oct6100api/oct6100_defines.h b/drivers/dahdi/oct612x/include/oct6100api/oct6100_defines.h
index ab7aab8..0164c7f 100644
--- a/drivers/dahdi/oct612x/include/oct6100api/oct6100_defines.h
+++ b/drivers/dahdi/oct612x/include/oct6100api/oct6100_defines.h
@@ -358,7 +358,7 @@ $Octasic_Revision: 171 $
#define cOCT6100_CHANNEL_ROOT_GLOBAL_CONF_OFFSET 0x0000
#define cOCT6100_NUM_WORDS_PER_TONE_EVENT 32
-#define cOCT6100_NUM_PGSP_EVENT_OUT 2048
+#define cOCT6100_NUM_PGSP_EVENT_OUT 128
#define cOCT6100_VALID_TONE_EVENT 0x8000
#define cOCT6100_LOCAL_TIMESTAMP_INCREMENT 32 /* 4 ms increment. */
#define cOCT6100_ABSOLUTE_MAX_NUM_PGSP_EVENT_OUT 65535
commit 4054c2315c56b74ec9ec1d69f0009c3bfa4ca3c3
Author: Shaun Ruffell <sruffell at digium.com>
Date: Tue Feb 1 12:44:35 2011 -0600
wip: turn on / off tracing
diff --git a/drivers/dahdi/wct4xxp/vpm450m.c b/drivers/dahdi/wct4xxp/vpm450m.c
index 3d93572..45648e3 100644
--- a/drivers/dahdi/wct4xxp/vpm450m.c
+++ b/drivers/dahdi/wct4xxp/vpm450m.c
@@ -484,6 +484,7 @@ struct vpm450m *init_vpm450m(void *wc, int *isalaw, int numspans, const struct f
ChipOpen->fEnableAcousticEcho = TRUE;
#endif
+ tracing_on();
ulResult = Oct6100GetInstanceSize(ChipOpen, &InstanceSize);
if (ulResult != cOCT6100_ERR_OK) {
printk(KERN_NOTICE "Failed to get instance size, code %08x!\n", ulResult);
@@ -493,9 +494,10 @@ struct vpm450m *init_vpm450m(void *wc, int *isalaw, int numspans, const struct f
return NULL;
}
-
trace_printk("InstanceSize.ulApiInstanceSize: %d\n", InstanceSize.ulApiInstanceSize);
+ tracing_off();
+
vpm450m->pApiInstance = vmalloc(InstanceSize.ulApiInstanceSize);
if (!vpm450m->pApiInstance) {
printk(KERN_NOTICE "Out of memory (can't allocate %d bytes)!\n", InstanceSize.ulApiInstanceSize);
@@ -580,6 +582,7 @@ struct vpm450m *init_vpm450m(void *wc, int *isalaw, int numspans, const struct f
#endif
kfree(ChipOpen);
kfree(ChannelOpen);
+ tracing_on();
return vpm450m;
}
commit df7d4c56f201e066145574483ef74e3d7f791bec
Author: Shaun Ruffell <sruffell at digium.com>
Date: Tue Feb 1 12:43:57 2011 -0600
wip
diff --git a/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c b/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c
index e43ebe4..804101a 100644
--- a/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c
+++ b/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c
@@ -219,7 +219,7 @@ UINT32 Oct6100ChipOpenDef(
f_pChipOpen->fEnableFastH100Mode = FALSE;
/* Configure the soft tone event buffer. */
- f_pChipOpen->ulSoftToneEventsBufSize = 2048;
+ f_pChipOpen->ulSoftToneEventsBufSize = 128;
f_pChipOpen->fEnableExtToneDetection = FALSE;
f_pChipOpen->fEnable2100StopEvent = FALSE;
commit 7ec450e95756fc0141b491cd3247c8043ffceeb5
Author: Shaun Ruffell <sruffell at digium.com>
Date: Mon Jan 31 18:59:20 2011 -0600
wip
diff --git a/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c b/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c
index a74e503..e43ebe4 100644
--- a/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c
+++ b/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c
@@ -1702,8 +1702,6 @@ UINT32 Oct6100ApiCalculateInstanceSizes(
if ( ulResult != cOCT6100_ERR_OK )
return ulResult;
-
-
/*-----------------------------------------------------------------------------*/
/* Memory needed by soft Rx Event buffers. */
ulResult = Oct6100ApiGetEventsSwSizes( f_pChipOpen, f_pInstSizes );
@@ -1776,6 +1774,7 @@ UINT32 Oct6100ApiCalculateInstanceSizes(
ulApiInstProcessSpecific = sizeof( tOCT6100_INSTANCE_API );
mOCT6100_ROUND_MEMORY_SIZE( ulApiInstProcessSpecific, ulTempVar )
+ trace_printk("ulApiInstProcessSpecific : %d\n", ulApiInstProcessSpecific );
f_pInstSizes->ulApiInstTotal =
f_pInstSizes->ulChannelList +
commit 2b602fcd630ebe8187abfa8bf8fc04f71a688c0a
Author: Shaun Ruffell <sruffell at digium.com>
Date: Mon Jan 31 18:55:55 2011 -0600
wip
diff --git a/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c b/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c
index 112701b..a74e503 100644
--- a/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c
+++ b/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c
@@ -1662,7 +1662,7 @@ UINT32 Oct6100ApiCalculateInstanceSizes(
/* Obtain size of static members of API instance. */
f_pInstSizes->ulApiInstStatic = sizeof( tOCT6100_SHARED_INFO );
mOCT6100_ROUND_MEMORY_SIZE( f_pInstSizes->ulApiInstStatic, ulTempVar )
- trace_printk("ulApiInstStatic: %d", f_pInstSizes->ulApiInstStatic);
+ trace_printk("ulApiInstStatic: %d\n", f_pInstSizes->ulApiInstStatic);
/* Calculate memory needed by pointers internal to the API instance. */
@@ -1678,27 +1678,27 @@ UINT32 Oct6100ApiCalculateInstanceSizes(
/*-----------------------------------------------------------------------------*/
/* Memory needed by the TSI structures. */
ulResult = Oct6100ApiGetTsiCnctSwSizes( f_pChipOpen, f_pInstSizes );
- trace_printk("ulTsiCnctList: %d", f_pInstSizes->ulTsiCnctList);
- trace_printk("ulTsiCnctAlloc: %d", f_pInstSizes->ulTsiCnctAlloc);
+ trace_printk("ulTsiCnctList: %d\n", f_pInstSizes->ulTsiCnctList);
+ trace_printk("ulTsiCnctAlloc: %d\n", f_pInstSizes->ulTsiCnctAlloc);
if ( ulResult != cOCT6100_ERR_OK )
return ulResult;
/*-----------------------------------------------------------------------------*/
/* Calculate memory needed for the conference bridges. */
ulResult = Oct6100ApiGetConfBridgeSwSizes( f_pChipOpen, f_pInstSizes );
/* Calculate memory needed for list and allocation software serialization. */
- trace_printk("ulConfBridgeList: %d", f_pInstSizes->ulConfBridgeList);
- trace_printk("ulConfBridgeAlloc: %d", f_pInstSizes->ulConfBridgeAlloc);
- trace_printk("ulFlexConfParticipantsList: %d", f_pInstSizes->ulFlexConfParticipantsList);
- trace_printk("ulFlexConfParticipantsAlloc: %d", f_pInstSizes->ulFlexConfParticipantsAlloc);
+ trace_printk("ulConfBridgeList: %d\n", f_pInstSizes->ulConfBridgeList);
+ trace_printk("ulConfBridgeAlloc: %d\n", f_pInstSizes->ulConfBridgeAlloc);
+ trace_printk("ulFlexConfParticipantsList: %d\n", f_pInstSizes->ulFlexConfParticipantsList);
+ trace_printk("ulFlexConfParticipantsAlloc: %d\n", f_pInstSizes->ulFlexConfParticipantsAlloc);
if ( ulResult != cOCT6100_ERR_OK )
return ulResult;
/*-----------------------------------------------------------------------------*/
/* Memory needed by the buffer playout structures. */
ulResult = Oct6100ApiGetPlayoutBufferSwSizes( f_pChipOpen, f_pInstSizes );
- trace_printk("ulPlayoutBufList: %d", f_pInstSizes->ulPlayoutBufList);
- trace_printk("ulPlayoutBufAlloc: %d", f_pInstSizes->ulPlayoutBufAlloc);
- trace_printk("ulPlayoutBufMemoryNodeList: %d", f_pInstSizes->ulPlayoutBufMemoryNodeList);
+ trace_printk("ulPlayoutBufList: %d\n", f_pInstSizes->ulPlayoutBufList);
+ trace_printk("ulPlayoutBufAlloc: %d\n", f_pInstSizes->ulPlayoutBufAlloc);
+ trace_printk("ulPlayoutBufMemoryNodeList: %d\n", f_pInstSizes->ulPlayoutBufMemoryNodeList);
if ( ulResult != cOCT6100_ERR_OK )
return ulResult;
@@ -1707,22 +1707,22 @@ UINT32 Oct6100ApiCalculateInstanceSizes(
/*-----------------------------------------------------------------------------*/
/* Memory needed by soft Rx Event buffers. */
ulResult = Oct6100ApiGetEventsSwSizes( f_pChipOpen, f_pInstSizes );
- trace_printk("ulSoftToneEventsBuffer: %d", f_pInstSizes->ulSoftToneEventsBuffer);
- trace_printk("ulSoftBufPlayoutEventsBuffer: %d", f_pInstSizes->ulSoftBufPlayoutEventsBuffer);
+ trace_printk("ulSoftToneEventsBuffer: %d\n", f_pInstSizes->ulSoftToneEventsBuffer);
+ trace_printk("ulSoftBufPlayoutEventsBuffer: %d\n", f_pInstSizes->ulSoftBufPlayoutEventsBuffer);
if ( ulResult != cOCT6100_ERR_OK )
return ulResult;
/*-----------------------------------------------------------------------------*/
/* Calculate memory needed for phasing tssts. */
ulResult = Oct6100ApiGetPhasingTsstSwSizes( f_pChipOpen, f_pInstSizes );
- trace_printk("ulPhasingTsstList: %d", f_pInstSizes->ulPhasingTsstList);
- trace_printk("ulPhasingTsstAlloc: %d", f_pInstSizes->ulPhasingTsstAlloc);
+ trace_printk("ulPhasingTsstList: %d\n", f_pInstSizes->ulPhasingTsstList);
+ trace_printk("ulPhasingTsstAlloc: %d\n", f_pInstSizes->ulPhasingTsstAlloc);
if ( ulResult != cOCT6100_ERR_OK )
return ulResult;
/*-----------------------------------------------------------------------------*/
/* Calculate memory needed for the ADPCM channels. */
ulResult = Oct6100ApiGetAdpcmChanSwSizes( f_pChipOpen, f_pInstSizes );
- trace_printk("ulAdpcmChannelList: %d", f_pInstSizes->ulAdpcmChannelList);
+ trace_printk("ulAdpcmChannelList: %d\n", f_pInstSizes->ulAdpcmChannelList);
trace_printk("ulAdpcmChannelAlloc: %d\n", f_pInstSizes->ulAdpcmChannelAlloc);
if ( ulResult != cOCT6100_ERR_OK )
return ulResult;
commit d93bdc4bd16ab70bb2c56420dacb0c27d33a6cea
Author: Shaun Ruffell <sruffell at digium.com>
Date: Mon Jan 31 18:53:53 2011 -0600
wip
diff --git a/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c b/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c
index 9b88302..112701b 100644
--- a/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c
+++ b/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c
@@ -1662,28 +1662,43 @@ UINT32 Oct6100ApiCalculateInstanceSizes(
/* Obtain size of static members of API instance. */
f_pInstSizes->ulApiInstStatic = sizeof( tOCT6100_SHARED_INFO );
mOCT6100_ROUND_MEMORY_SIZE( f_pInstSizes->ulApiInstStatic, ulTempVar )
+ trace_printk("ulApiInstStatic: %d", f_pInstSizes->ulApiInstStatic);
/* Calculate memory needed by pointers internal to the API instance. */
/*-----------------------------------------------------------------------------*/
/* Calculate memory needed for the EC channels. */
ulResult = Oct6100ApiGetChannelsEchoSwSizes( f_pChipOpen, f_pInstSizes );
+ trace_printk("ulChannelList: %d\n", f_pInstSizes->ulChannelList);
+ trace_printk("ulChannelAlloc: %d\n", f_pInstSizes->ulChannelAlloc);
+ trace_printk("ulBiDirChannelList: %d\n", f_pInstSizes->ulBiDirChannelList);
+ trace_printk("ulBiDirChannelAlloc: %d\n", f_pInstSizes->ulBiDirChannelAlloc);
if ( ulResult != cOCT6100_ERR_OK )
return ulResult;
/*-----------------------------------------------------------------------------*/
/* Memory needed by the TSI structures. */
ulResult = Oct6100ApiGetTsiCnctSwSizes( f_pChipOpen, f_pInstSizes );
+ trace_printk("ulTsiCnctList: %d", f_pInstSizes->ulTsiCnctList);
+ trace_printk("ulTsiCnctAlloc: %d", f_pInstSizes->ulTsiCnctAlloc);
if ( ulResult != cOCT6100_ERR_OK )
return ulResult;
/*-----------------------------------------------------------------------------*/
/* Calculate memory needed for the conference bridges. */
ulResult = Oct6100ApiGetConfBridgeSwSizes( f_pChipOpen, f_pInstSizes );
+ /* Calculate memory needed for list and allocation software serialization. */
+ trace_printk("ulConfBridgeList: %d", f_pInstSizes->ulConfBridgeList);
+ trace_printk("ulConfBridgeAlloc: %d", f_pInstSizes->ulConfBridgeAlloc);
+ trace_printk("ulFlexConfParticipantsList: %d", f_pInstSizes->ulFlexConfParticipantsList);
+ trace_printk("ulFlexConfParticipantsAlloc: %d", f_pInstSizes->ulFlexConfParticipantsAlloc);
if ( ulResult != cOCT6100_ERR_OK )
return ulResult;
/*-----------------------------------------------------------------------------*/
/* Memory needed by the buffer playout structures. */
ulResult = Oct6100ApiGetPlayoutBufferSwSizes( f_pChipOpen, f_pInstSizes );
+ trace_printk("ulPlayoutBufList: %d", f_pInstSizes->ulPlayoutBufList);
+ trace_printk("ulPlayoutBufAlloc: %d", f_pInstSizes->ulPlayoutBufAlloc);
+ trace_printk("ulPlayoutBufMemoryNodeList: %d", f_pInstSizes->ulPlayoutBufMemoryNodeList);
if ( ulResult != cOCT6100_ERR_OK )
return ulResult;
@@ -1692,29 +1707,43 @@ UINT32 Oct6100ApiCalculateInstanceSizes(
/*-----------------------------------------------------------------------------*/
/* Memory needed by soft Rx Event buffers. */
ulResult = Oct6100ApiGetEventsSwSizes( f_pChipOpen, f_pInstSizes );
+ trace_printk("ulSoftToneEventsBuffer: %d", f_pInstSizes->ulSoftToneEventsBuffer);
+ trace_printk("ulSoftBufPlayoutEventsBuffer: %d", f_pInstSizes->ulSoftBufPlayoutEventsBuffer);
if ( ulResult != cOCT6100_ERR_OK )
return ulResult;
/*-----------------------------------------------------------------------------*/
/* Calculate memory needed for phasing tssts. */
ulResult = Oct6100ApiGetPhasingTsstSwSizes( f_pChipOpen, f_pInstSizes );
+ trace_printk("ulPhasingTsstList: %d", f_pInstSizes->ulPhasingTsstList);
+ trace_printk("ulPhasingTsstAlloc: %d", f_pInstSizes->ulPhasingTsstAlloc);
if ( ulResult != cOCT6100_ERR_OK )
return ulResult;
/*-----------------------------------------------------------------------------*/
/* Calculate memory needed for the ADPCM channels. */
ulResult = Oct6100ApiGetAdpcmChanSwSizes( f_pChipOpen, f_pInstSizes );
+ trace_printk("ulAdpcmChannelList: %d", f_pInstSizes->ulAdpcmChannelList);
+ trace_printk("ulAdpcmChannelAlloc: %d\n", f_pInstSizes->ulAdpcmChannelAlloc);
if ( ulResult != cOCT6100_ERR_OK )
return ulResult;
/*-----------------------------------------------------------------------------*/
/* Calculate memory needed for the management of TSSTs. */
ulResult = Oct6100ApiGetTsstSwSizes( f_pInstSizes );
+ trace_printk("ulTsstAlloc: %d\n", f_pInstSizes->ulTsstAlloc);
+ trace_printk("ulTsstEntryList: %d\n", f_pInstSizes->ulTsstEntryList);
+ trace_printk("ulTsstEntryAlloc: %d\n", f_pInstSizes->ulTsstEntryAlloc);
+
if ( ulResult != cOCT6100_ERR_OK )
return ulResult;
/*-----------------------------------------------------------------------------*/
/* Calculate memory needed for the management of the mixer. */
ulResult = Oct6100ApiGetMixerSwSizes( f_pChipOpen, f_pInstSizes );
+ trace_printk("ulMixerEventList: %d\n", f_pInstSizes->ulMixerEventList);
+ trace_printk("ulMixerEventAlloc: %d\n", f_pInstSizes->ulMixerEventAlloc);
+ trace_printk("ulCopyEventList: %d\n", f_pInstSizes->ulCopyEventList);
+ trace_printk("ulCopyEventAlloc: %d\n", f_pInstSizes->ulCopyEventAlloc);
if ( ulResult != cOCT6100_ERR_OK )
return ulResult;
@@ -1723,12 +1752,18 @@ UINT32 Oct6100ApiCalculateInstanceSizes(
pieces of software will be responsible for the allocation of the chip's
external memory and API memory. */
ulResult = Oct6100ApiGetMemorySwSizes( f_pChipOpen, f_pInstSizes );
+ trace_printk("ulTsiMemoryAlloc: %d\n", f_pInstSizes->ulTsiMemoryAlloc);
+ trace_printk("ulConversionMemoryAlloc: %d\n", f_pInstSizes->ulConversionMemoryAlloc);
if ( ulResult != cOCT6100_ERR_OK )
return ulResult;
/*-----------------------------------------------------------------------------*/
/* Memory needed for remote debugging sessions. */
ulResult = Oct6100ApiGetRemoteDebugSwSizes( f_pChipOpen, f_pInstSizes );
+ trace_printk("ulRemoteDebugList: %d\n", f_pInstSizes->ulRemoteDebugList);
+ trace_printk("ulRemoteDebugTree: %d\n", f_pInstSizes->ulRemoteDebugTree);
+ trace_printk("ulRemoteDebugPktCache: %d\n", f_pInstSizes->ulRemoteDebugPktCache);
+ trace_printk("ulRemoteDebugDataBuf: %d\n", f_pInstSizes->ulRemoteDebugDataBuf);
if ( ulResult != cOCT6100_ERR_OK )
return ulResult;
commit ab50525e43a7d28cd7aff919ddcafa73ef6aea94
Author: Shaun Ruffell <sruffell at digium.com>
Date: Mon Jan 31 18:12:16 2011 -0600
wip
diff --git a/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c b/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c
index 00c0fec..9b88302 100644
--- a/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c
+++ b/drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c
@@ -240,7 +240,7 @@ UINT32 Oct6100ChipOpenDef(
f_pChipOpen->InterruptConfig.ulFatalMemoryTimeout = 100;
f_pChipOpen->InterruptConfig.ulErrorH100Timeout = 100;
f_pChipOpen->InterruptConfig.ulErrorOverflowToneEventsTimeout = 100;
- f_pChipOpen->ulMaxRemoteDebugSessions = 1;
+ f_pChipOpen->ulMaxRemoteDebugSessions = 0;
f_pChipOpen->ulTdmSampling = cOCT6100_TDM_SAMPLE_AT_3_QUARTERS;
for ( i = 0; i < cOCT6100_TDM_STREAM_MAX_GROUPS; i++ )
f_pChipOpen->aulTdmStreamFreqs[ i ] = cOCT6100_TDM_STREAM_FREQ_8MHZ;
diff --git a/drivers/dahdi/wct4xxp/Kbuild b/drivers/dahdi/wct4xxp/Kbuild
index 39b786b..29b0931 100644
--- a/drivers/dahdi/wct4xxp/Kbuild
+++ b/drivers/dahdi/wct4xxp/Kbuild
@@ -2,7 +2,7 @@ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCT4XXP) += wct4xxp.o
FIRM_DIR := ../firmware
-EXTRA_CFLAGS += -I$(src)/.. $(shell $(src)/../oct612x/octasic-helper cflags $(src)/../oct612x) -Wno-undef
+EXTRA_CFLAGS += -I$(src)/.. $(shell $(src)/../oct612x/octasic-helper cflags $(src)/../oct612x) -Wno-undef -O0
ifeq ($(HOTPLUG_FIRMWARE),yes)
EXTRA_CFLAGS+=-DHOTPLUG_FIRMWARE
diff --git a/drivers/dahdi/wct4xxp/vpm450m.c b/drivers/dahdi/wct4xxp/vpm450m.c
index e04922e..3d93572 100644
--- a/drivers/dahdi/wct4xxp/vpm450m.c
+++ b/drivers/dahdi/wct4xxp/vpm450m.c
@@ -468,12 +468,18 @@ struct vpm450m *init_vpm450m(void *wc, int *isalaw, int numspans, const struct f
ChipOpen->fEnableMemClkOut = TRUE;
ChipOpen->ulMemClkFreq = cOCT6100_MCLK_FREQ_133_MHZ;
ChipOpen->ulMaxChannels = vpm450m->numchans;
+ ChipOpen->ulMaxTsiCncts = vpm450m->numchans;
ChipOpen->ulMemoryType = cOCT6100_MEM_TYPE_DDR;
ChipOpen->ulMemoryChipSize = cOCT6100_MEMORY_CHIP_SIZE_32MB;
ChipOpen->ulNumMemoryChips = 1;
ChipOpen->ulMaxTdmStreams = 4;
ChipOpen->aulTdmStreamFreqs[0] = cOCT6100_TDM_STREAM_FREQ_8MHZ;
ChipOpen->ulTdmSampling = cOCT6100_TDM_SAMPLE_AT_FALLING_EDGE;
+ ChipOpen->ulMaxFlexibleConfParticipants = 0;
+ ChipOpen->ulMaxConfBridges = 0;
+ ChipOpen->ulMaxRemoteDebugSessions = 0;
+ ChipOpen->fEnableChannelRecording = FALSE;
+
#if 0
ChipOpen->fEnableAcousticEcho = TRUE;
#endif
@@ -488,6 +494,8 @@ struct vpm450m *init_vpm450m(void *wc, int *isalaw, int numspans, const struct f
}
+ trace_printk("InstanceSize.ulApiInstanceSize: %d\n", InstanceSize.ulApiInstanceSize);
+
vpm450m->pApiInstance = vmalloc(InstanceSize.ulApiInstanceSize);
if (!vpm450m->pApiInstance) {
printk(KERN_NOTICE "Out of memory (can't allocate %d bytes)!\n", InstanceSize.ulApiInstanceSize);
@@ -554,6 +562,7 @@ struct vpm450m *init_vpm450m(void *wc, int *isalaw, int numspans, const struct f
ulResult = Oct6100ChannelOpen(vpm450m->pApiInstance, ChannelOpen);
if (ulResult != GENERIC_OK) {
printk(KERN_NOTICE "Failed to open channel %d!\n", x);
+ continue;
}
for (y=0;y<sizeof(tones) / sizeof(tones[0]); y++) {
tOCT6100_TONE_DETECTION_ENABLE enable;
commit 92eea5bb47b0eeb701d8674b1cf5de9bee29b649
Author: Shaun Ruffell <sruffell at digium.com>
Date: Wed Jan 26 14:17:42 2011 -0600
delete: Remove the non-wct4xxp drivers
diff --git a/drivers/dahdi/Kbuild b/drivers/dahdi/Kbuild
index e138573..48fe281 100644
--- a/drivers/dahdi/Kbuild
+++ b/drivers/dahdi/Kbuild
@@ -1,32 +1,32 @@
obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI) += dahdi.o
#obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_DUMMY) += dahdi_dummy.o
-obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_DYNAMIC) += dahdi_dynamic.o
-obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_DYNAMIC_LOC) += dahdi_dynamic_loc.o
-obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_DYNAMIC_ETH) += dahdi_dynamic_eth.o
-obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_DYNAMIC_ETHMF) += dahdi_dynamic_ethmf.o
-obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_TRANSCODE) += dahdi_transcode.o
+#obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_DYNAMIC) += dahdi_dynamic.o
+#obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_DYNAMIC_LOC) += dahdi_dynamic_loc.o
+#obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_DYNAMIC_ETH) += dahdi_dynamic_eth.o
+#obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_DYNAMIC_ETHMF) += dahdi_dynamic_ethmf.o
+#obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_TRANSCODE) += dahdi_transcode.o
obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCT4XXP) += wct4xxp/
-obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTC4XXP) += wctc4xxp/
-obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTDM24XXP) += wctdm24xxp/
-obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTE12XP) += wcte12xp/
-obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTDM) += wctdm.o
-obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_VOICEBUS) += voicebus/
-obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCB4XXP) += wcb4xxp/
-
-obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCT1XXP) += wct1xxp.o
-obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTE11XP) += wcte11xp.o
-
-obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCFXO) += wcfxo.o
-obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_TOR2) += tor2.o
-obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_PCIRADIO) += pciradio.o
-
-obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_XPP) += xpp/
-
-obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_JPAH) += dahdi_echocan_jpah.o
-obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_STEVE) += dahdi_echocan_sec.o
-obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_STEVE2) += dahdi_echocan_sec2.o
-obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_KB1) += dahdi_echocan_kb1.o
+#obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTC4XXP) += wctc4xxp/
+#obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTDM24XXP) += wctdm24xxp/
+#obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTE12XP) += wcte12xp/
+#obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTDM) += wctdm.o
+#obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_VOICEBUS) += voicebus/
+#obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCB4XXP) += wcb4xxp/
+
+#obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCT1XXP) += wct1xxp.o
+#obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTE11XP) += wcte11xp.o
+
+#obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCFXO) += wcfxo.o
+#obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_TOR2) += tor2.o
+#obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_PCIRADIO) += pciradio.o
+
+#obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_XPP) += xpp/
+
+#obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_JPAH) += dahdi_echocan_jpah.o
+#obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_STEVE) += dahdi_echocan_sec.o
+#obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_STEVE2) += dahdi_echocan_sec2.o
+#obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_KB1) += dahdi_echocan_kb1.o
obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_MG2) += dahdi_echocan_mg2.o
obj-m += $(DAHDI_MODULES_EXTRA)
@@ -104,15 +104,15 @@ endif
# VPMADT032 Loader
###############################################################################
-dahdi_vpmadt032_loader-objs := vpmadt032_loader/dahdi_vpmadt032_loader.o
-
-ifneq ($(DAHDI_ARCH),)
- ifneq ($(wildcard $(src)/vpmadt032_loader/vpmadt032_$(DAHDI_ARCH).o_shipped),)
- VPMADT032_LOADER_PRESENT=yes
- dahdi_vpmadt032_loader-objs += vpmadt032_loader/vpmadt032_$(DAHDI_ARCH).o
- obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_VPMADT032_LOADER) += dahdi_vpmadt032_loader.o
- endif
-endif
+#dahdi_vpmadt032_loader-objs := vpmadt032_loader/dahdi_vpmadt032_loader.o
+#
+#ifneq ($(DAHDI_ARCH),)
+# ifneq ($(wildcard $(src)/vpmadt032_loader/vpmadt032_$(DAHDI_ARCH).o_shipped),)
+# VPMADT032_LOADER_PRESENT=yes
+# dahdi_vpmadt032_loader-objs += vpmadt032_loader/vpmadt032_$(DAHDI_ARCH).o
+# obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_VPMADT032_LOADER) += dahdi_vpmadt032_loader.o
+# endif
+#endif
###############################################################################
# HPEC Support
-----------------------------------------------------------------------
--
team/sruffell/dahdi-linux.git
More information about the asterisk-scf-commits
mailing list