diff options
| author | sruffell <sruffell@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-04-03 21:11:24 +0000 |
|---|---|---|
| committer | sruffell <sruffell@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-04-03 21:11:24 +0000 |
| commit | b88dcb40c9342fa0307e9c8d020db3fbba699c62 (patch) | |
| tree | 8ea1c725ea4a909f0747a44f3959464e2f6ff345 /wcte12xp | |
| parent | 18c27fc575b8195d5a850b885cc94459b21743c3 (diff) | |
svn merge -c3012 https://origsvn.digium.com/svn/zaptel/branches/1.4 .
svn merge -c3701 https://origsvn.digium.com/svn/zaptel/branches/1.4 .
svn merge -c3703 https://origsvn.digium.com/svn/zaptel/branches/1.4 .
svn merge -c4050 https://origsvn.digium.com/svn/zaptel/branches/1.4/kernel .
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@4128 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'wcte12xp')
| -rw-r--r-- | wcte12xp/GpakApi.c | 6 | ||||
| -rw-r--r-- | wcte12xp/base.c | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/wcte12xp/GpakApi.c b/wcte12xp/GpakApi.c index 8582350..8e280a4 100644 --- a/wcte12xp/GpakApi.c +++ b/wcte12xp/GpakApi.c @@ -128,10 +128,12 @@ static int CheckDspReset( DSP_ADDRESS IfBlockPntr; /* Interface Block pointer */ DSP_WORD DspStatus; /* DSP Status */ DSP_WORD DspChannels; /* number of DSP channels */ + DSP_WORD Temp[2]; +#if 0 DSP_WORD DspConfs; /* number of DSP conferences */ DSP_ADDRESS PktBufrMem; /* address of Packet Buffer */ - DSP_WORD Temp[2]; unsigned short int i; /* loop index / counter */ +#endif /* Read the pointer to the Interface Block. */ gpakReadDspMemory(DspId, DSP_IFBLK_ADDRESS, 2, Temp); @@ -897,7 +899,9 @@ gpakReadEventFIFOMessageStat_t gpakReadEventFIFOMessage( DSP_WORD TakeIndex; /* event fifo take index */ DSP_WORD WordsReady; /* number words ready for read out of event fifo */ DSP_WORD EventError; /* flag indicating error with event fifo msg */ +#if 0 DSP_WORD *pDebugData; /* debug data buffer pointer in event data struct */ +#endif /* Make sure the DSP Id is valid. */ if (DspId >= MAX_DSP_CORES) diff --git a/wcte12xp/base.c b/wcte12xp/base.c index 24e99da..ced5103 100644 --- a/wcte12xp/base.c +++ b/wcte12xp/base.c @@ -1724,7 +1724,6 @@ static inline void t1_transmitprep(struct t1 *wc, int dbl) static inline void cmd_retransmit(struct t1 *wc) { unsigned int x; - unsigned long flags; for (x = 0; x < sizeof(wc->cmdq.cmds) / sizeof(wc->cmdq.cmds[0]); x++) { if (!(wc->cmdq.cmds[x].flags & __CMD_FIN)) { |