From 5ef35984333680ed2fa68ffc1f35e8e060f52d4c Mon Sep 17 00:00:00 2001 From: Octasic Inc Date: Fri, 2 Oct 2009 10:55:16 +0200 Subject: importing OCT612x-01.03.02 --- .../oct6100api/oct6100_api/oct6100_debug.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'software/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.c') diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.c index 9fbb269..20a6ba9 100644 --- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.c +++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.c @@ -22,9 +22,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.03.00 $ +$Octasic_Release: OCT612xAPI-01.03.02 $ -$Octasic_Revision: 74 $ +$Octasic_Revision: 76 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -681,8 +681,6 @@ UINT32 Oct6100DebugGetDataSer( pSharedInfo->DebugInfo.usNumEvents--; } - - /* If the user only requested the last 16 seconds, cap the number of events. */ if ( f_pGetData->ulGetDataMode == cOCT6100_DEBUG_GET_DATA_MODE_16S || f_pGetData->ulGetDataMode == cOCT6100_DEBUG_GET_DATA_MODE_16S_LITE @@ -1603,8 +1601,20 @@ UINT32 Oct6100DebugCoreDumpMemory( ReadBurstParams.ulReadAddress = pSharedInfo->DebugInfo.ulLastMemoryOffset; /* Some internal memory regions cannot be read. Check for these here. */ - if ( ( ReadBurstParams.ulReadAddress >= 0xF0000 ) - && ( ReadBurstParams.ulReadAddress < 0x100000 ) ) + if ( ( ReadBurstParams.ulReadAddress >= 0x14a80 ) + && ( ReadBurstParams.ulReadAddress < 0x26000 ) || + ( ReadBurstParams.ulReadAddress >= 0x26640 ) + && ( ReadBurstParams.ulReadAddress < 0x28000 ) || + ( ReadBurstParams.ulReadAddress >= 0x2AA00 ) + && ( ReadBurstParams.ulReadAddress < 0x220000 ) || + ( ReadBurstParams.ulReadAddress >= 0x235000 ) + && ( ReadBurstParams.ulReadAddress < 0x240000 ) || + ( ReadBurstParams.ulReadAddress >= 0x255000 ) + && ( ReadBurstParams.ulReadAddress < 0x260000 ) || + ( ReadBurstParams.ulReadAddress >= 0x26a800 ) + && ( ReadBurstParams.ulReadAddress < 0x280000 ) || + ( ReadBurstParams.ulReadAddress >= 0x285400 ) + && ( ReadBurstParams.ulReadAddress < 0x8000000 )) { /* Region cannot be read. */ Oct6100UserMemSet( pSharedInfo->MiscVars.ausSuperArray, 0, cOCT6100_INTERNAL_SUPER_ARRAY_SIZE * sizeof( UINT16 ) ); -- cgit v1.2.3