1.1 --- a/epoc32/include/e32def.h Wed Mar 31 12:27:01 2010 +0100
1.2 +++ b/epoc32/include/e32def.h Wed Mar 31 12:33:34 2010 +0100
1.3 @@ -2,9 +2,9 @@
1.4 * Copyright (c) 1994-2009 Nokia Corporation and/or its subsidiary(-ies).
1.5 * All rights reserved.
1.6 * This component and the accompanying materials are made available
1.7 -* under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
1.8 +* under the terms of the License "Eclipse Public License v1.0"
1.9 * which accompanies this distribution, and is available
1.10 -* at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
1.11 +* at the URL "http://www.eclipse.org/legal/epl-v10.html".
1.12 *
1.13 * Initial Contributors:
1.14 * Nokia Corporation - initial contribution.
1.15 @@ -20,8 +20,6 @@
1.16
1.17
1.18
1.19 -
1.20 -
1.21 #ifndef __E32DEF_H__
1.22 #define __E32DEF_H__
1.23
1.24 @@ -33,48 +31,6 @@
1.25 #endif
1.26
1.27
1.28 -
1.29 -
1.30 -
1.31 -#ifdef __PROFILING__
1.32 -
1.33 -/**
1.34 -@publishedPartner
1.35 -@removed
1.36 -*/
1.37 -#define __PROFILE_START(aBin) RDebug::ProfileStart(aBin)
1.38 -
1.39 -/**
1.40 -@publishedPartner
1.41 -@removed
1.42 -*/
1.43 -#define __PROFILE_END(aBin) RDebug::ProfileEnd(aBin)
1.44 -
1.45 -/**
1.46 -@publishedPartner
1.47 -@removed
1.48 -*/
1.49 -#define __PROFILE_RESET(aNumberOfBins) RDebug::ProfileReset(0,aNumberOfBins)
1.50 -
1.51 -/**
1.52 -@publishedPartner
1.53 -@removed
1.54 -*/
1.55 -#define __PROFILE_DISPLAY(aNumberOfBins) \
1.56 - { TFixedArray<TProfile, aNumberOfBins> result; \
1.57 - RDebug::ProfileResult(result.Begin(), 0, aNumberOfBins); \
1.58 - for (TInt i=0; i<aNumberOfBins; i++) \
1.59 - RDebug::Print(_L("Profile bin %d: Calls: %d, Clock ticks: %d\n" ),i,res[i].iCount,result[i].iTime); \
1.60 - }
1.61 -#else /* __PROFILING__ */
1.62 -#define __PROFILE_START(aBin)
1.63 -#define __PROFILE_END(aBin)
1.64 -#define __PROFILE_RESET(aNumberOfBins)
1.65 -#define __PROFILE_DISPLAY(aNumberOfBins)
1.66 -#endif
1.67 -
1.68 -
1.69 -
1.70 #if defined(__VC32__)
1.71 /**
1.72 @publishedAll
1.73 @@ -109,6 +65,16 @@
1.74 @publishedAll
1.75 @released
1.76 */
1.77 +#define IMPORT_D __declspec(dllexport)
1.78 +/**
1.79 +@publishedAll
1.80 +@released
1.81 +*/
1.82 +#define EXPORT_D __declspec(dllexport)
1.83 +/**
1.84 +@publishedAll
1.85 +@released
1.86 +*/
1.87 #define NONSHARABLE_CLASS(x) class x
1.88 /**
1.89 @publishedAll
1.90 @@ -158,6 +124,8 @@
1.91 #define __NORETURN_TERMINATOR()
1.92 #define IMPORT_C __declspec(dllexport)
1.93 #define EXPORT_C __declspec(dllexport)
1.94 +#define IMPORT_D __declspec(dllexport)
1.95 +#define EXPORT_D __declspec(dllexport)
1.96 #define NONSHARABLE_CLASS(x) class x
1.97 #define NONSHARABLE_STRUCT(x) struct x
1.98 #define __NO_THROW throw()
1.99 @@ -185,8 +153,13 @@
1.100 #endif
1.101
1.102
1.103 -
1.104 -#if defined(__GCC32__)
1.105 +//
1.106 +// GCC (ARM) compiler
1.107 +//
1.108 +#if defined(__GCC32__) && defined(__MARM__)
1.109 +#ifndef __GNUC__ /* GCC98r2 doesn't define this for some reason */
1.110 +#define __GNUC__ 2
1.111 +#endif
1.112 #define __NO_CLASS_CONSTS__
1.113 #define __NORETURN__ __attribute__ ((noreturn))
1.114 #ifdef __GCCV3__
1.115 @@ -195,12 +168,15 @@
1.116 #define __NORETURN_TERMINATOR() abort()
1.117 #endif
1.118 #define IMPORT_C
1.119 +#define IMPORT_D
1.120 #if !defined __WINS__ && defined _WIN32 /* VC++ Browser Hack */
1.121 #define EXPORT_C
1.122 +#define EXPORT_D
1.123 /** @internalTechnology */
1.124 #define asm(x)
1.125 #else
1.126 #define EXPORT_C __declspec(dllexport)
1.127 +#define EXPORT_D __declspec(dllexport)
1.128 #endif
1.129 #define NONSHARABLE_CLASS(x) class x
1.130 #define NONSHARABLE_STRUCT(x) struct x
1.131 @@ -211,11 +187,6 @@
1.132 #else
1.133 #define TEMPLATE_SPECIALIZATION
1.134 #endif
1.135 -#endif
1.136 -
1.137 -
1.138 -
1.139 -#ifdef __GCC32__
1.140 /**
1.141 @publishedAll
1.142 @released
1.143 @@ -224,7 +195,6 @@
1.144 #endif
1.145
1.146
1.147 -
1.148 /** @internalTechnology */
1.149 #define __NO_MUTABLE_KEYWORD
1.150 #if defined(__NO_MUTABLE_KEYWORD)
1.151 @@ -298,6 +268,14 @@
1.152 */
1.153 #define LOCAL_C static
1.154 /**
1.155 +@internalAll
1.156 +@prototype
1.157 +*/
1.158 +#ifndef IMPORT_D
1.159 +#define IMPORT_D IMPORT_C
1.160 +#endif
1.161 +
1.162 +/**
1.163 @publishedAll
1.164 @deprecated
1.165 */
1.166 @@ -468,7 +446,7 @@
1.167 #if __GNUC__ < 4
1.168 #define _FOFF(c,f) (((TInt)&(((c *)0x1000)->f))-0x1000)
1.169 #else
1.170 -#define _FOFF(c,f) __builtin_offsetof(c,f)
1.171 +#define _FOFF(c,f) (__builtin_offsetof(c,f))
1.172 #endif
1.173 #endif
1.174
1.175 @@ -570,6 +548,18 @@
1.176 @publishedAll
1.177 @released
1.178
1.179 +A signed integer type of the same size as a pointer.
1.180 +*/
1.181 +typedef TInt32 T_IntPtr;
1.182 +typedef TInt32 TIntPtr;
1.183 +
1.184 +
1.185 +
1.186 +
1.187 +/**
1.188 +@publishedAll
1.189 +@released
1.190 +
1.191 32-bit unsigned integer type; used in Symbian OS to mean a 32-bit
1.192 unsigned integer, independent of the implementation.
1.193 */
1.194 @@ -582,6 +572,18 @@
1.195 @publishedAll
1.196 @released
1.197
1.198 +An unsigned integer type of the same size as a pointer.
1.199 +*/
1.200 +typedef TUint32 T_UintPtr;
1.201 +typedef TUint32 TUintPtr;
1.202 +
1.203 +
1.204 +
1.205 +
1.206 +/**
1.207 +@publishedAll
1.208 +@released
1.209 +
1.210 Signed integer type of the natural machine word length.
1.211
1.212 This is as defined by the C++ implementation's int type. In all
1.213 @@ -746,9 +748,6 @@
1.214 Boolean, a machine word is used instead, so that these quantities can be easily
1.215 passed. Also, TBool must map onto int because of C++'s interpretation of
1.216 operands in conditional expressions.
1.217 -
1.218 -On implementations of Symbian OS in which the compiler supports the ANSI-recommended
1.219 -bool type, TBool will be typedef'ed to bool instead of int.
1.220 */
1.221 typedef int TBool;
1.222
1.223 @@ -761,37 +760,8 @@
1.224
1.225 Defines a linear (virtual) address type.
1.226 */
1.227 -typedef TUint32 TLinAddr;
1.228 -
1.229 -/**
1.230 -@internalTechnology
1.231 -
1.232 -A sorted list of all the code segments in ROM that contain an Exception Descriptor.
1.233 -
1.234 -*/
1.235 -typedef struct TRomExceptionSearchTable
1.236 - {
1.237 - /**
1.238 - The number of entries in the following table.
1.239 - */
1.240 - TInt32 iNumEntries;
1.241 -
1.242 - /**
1.243 - Address of the code segment of each TRomImageHeader that has an Exception Descriptor.
1.244 - */
1.245 - TLinAddr iEntries[1];
1.246 - } TRomExceptionSearchTable;
1.247 -
1.248 -/**
1.249 -@internalComponent
1.250 -*/
1.251 -typedef struct TExceptionDescriptor
1.252 - {
1.253 - TLinAddr iExIdxBase;
1.254 - TLinAddr iExIdxLimit;
1.255 - TLinAddr iROSegmentBase;
1.256 - TLinAddr iROSegmentLimit;
1.257 - } TExceptionDescriptor;
1.258 +typedef T_UintPtr TLinAddr;
1.259 +
1.260
1.261
1.262 #if defined(__GCC32__)
1.263 @@ -1341,14 +1311,6 @@
1.264
1.265 #if defined(_DEBUG)
1.266
1.267 -/**
1.268 -@internalComponent
1.269 -@deprecated
1.270 -*/
1.271 -#define __ASSERT_DEBUG_MB(aCond,aPanicNo) (void)((aCond)||(PanicMB(aPanicNo,_L(#aPanicNo),_L(#aCond)),0))
1.272 -
1.273 -
1.274 -
1.275
1.276 /**
1.277 @publishedAll
1.278 @@ -1657,243 +1619,6 @@
1.279 */
1.280 #define __UHEAP_CHECKFAILURE User::__DbgCheckFailure(FALSE)
1.281
1.282 -
1.283 -
1.284 -
1.285 -/**
1.286 -@publishedPartner
1.287 -@released
1.288 -
1.289 -Marks the start of Kernel heap checking.
1.290 -
1.291 -Checking the Kernel heap is only useful when developing Kernel side code such
1.292 -as device drivers and media drivers.
1.293 -
1.294 -This macro is defined only for debug builds.
1.295 -
1.296 -This macro must be matched by a corresponding call to __KHEAP_MARKEND or __KHEAP_MARKENDC.
1.297 -Calls to this macro can be nested but each call must be matched by corresponding
1.298 -call to __KHEAP_MARKEND or __KHEAP_MARKENDC.
1.299 -
1.300 -@see User::__DbgMarkStart()
1.301 -@see __KHEAP_MARKEND
1.302 -@see __KHEAP_MARKENDC
1.303 -*/
1.304 -#define __KHEAP_MARK User::__DbgMarkStart(TRUE)
1.305 -
1.306 -
1.307 -
1.308 -
1.309 -/**
1.310 -@publishedPartner
1.311 -@released
1.312 -
1.313 -Checks that the number of allocated cells at the current nested level of the
1.314 -Kernel heap is the same as the specified value. This macro is defined only
1.315 -for debug builds. Checking the Kernel heap is only useful when developing
1.316 -Kernel side code such as device drivers and media drivers.
1.317 -
1.318 -The macro also takes the name of the file containing this source code statement
1.319 -and the line number of this source code statement; they are displayed as part
1.320 -of the panic category, if the checks fail.
1.321 -
1.322 -@param aCount The number of heap cells expected to be allocated at
1.323 - the current nest level.
1.324 -
1.325 -@see User::__DbgMarkCheck()
1.326 -@see __UHEAP_CHECK
1.327 -*/
1.328 -#define __KHEAP_CHECK(aCount) User::__DbgMarkCheck(TRUE,FALSE,aCount,(TText8*)__FILE__,__LINE__)
1.329 -
1.330 -
1.331 -
1.332 -
1.333 -/**
1.334 -@publishedPartner
1.335 -@released
1.336 -
1.337 -Checks that the total number of allocated cells on the Kernel heap is the same
1.338 -as the specified value.
1.339 -
1.340 -It is only useful when developing Kernel side code such as device drivers
1.341 -and media drivers.
1.342 -
1.343 -The macro also takes the name of the file containing this source code statement
1.344 -and the line number of this source code statement; they are displayed as part
1.345 -of the panic category, if the checks fail.
1.346 -
1.347 -This macro is defined only for debug builds.
1.348 -
1.349 -@param aCount The total number of heap cells expected to be allocated
1.350 -
1.351 -@see User::__DbgMarkCheck()
1.352 -@see __UHEAP_CHECKALL
1.353 -*/
1.354 -#define __KHEAP_CHECKALL(aCount) User::__DbgMarkCheck(TRUE,TRUE,aCount,(TText8*)__FILE__,__LINE__)
1.355 -
1.356 -
1.357 -
1.358 -
1.359 -/**
1.360 -@publishedPartner
1.361 -@released
1.362 -
1.363 -Marks the end of Kernel heap checking. The macro expects zero heap cells to
1.364 -remain allocated at the current nest level.
1.365 -
1.366 -This macro is defined only for debug builds. Checking the Kernel heap is only
1.367 -useful when developing Kernel side code such as device drivers and media drivers.
1.368 -
1.369 -This macro must match an earlier call to __KHEAP_MARK.
1.370 -
1.371 -@see User::__DbgMarkEnd()
1.372 -@see __KHEAP_MARK
1.373 -*/
1.374 -#define __KHEAP_MARKEND User::__DbgMarkEnd(TRUE,0)
1.375 -
1.376 -
1.377 -
1.378 -
1.379 -/**
1.380 -@publishedPartner
1.381 -@released
1.382 -
1.383 -Marks the end of Kernel heap checking. The macro expects aCount heap cells
1.384 -to remain allocated at the current nest level.
1.385 -
1.386 -This macro is defined only for debug builds.
1.387 -
1.388 -This macro must match an earlier call to __KHEAP_MARK.
1.389 -
1.390 -@param aCount The number of heap cells expected to remain allocated at
1.391 - the current nest level.
1.392 -
1.393 -@see User::__DbgMarkEnd()
1.394 -@see __KHEAP_MARK
1.395 -*/
1.396 -#define __KHEAP_MARKENDC(aCount) User::__DbgMarkEnd(TRUE,aCount)
1.397 -
1.398 -
1.399 -
1.400 -
1.401 -/**
1.402 -@publishedPartner
1.403 -@released
1.404 -
1.405 -Simulates Kernel heap allocation failure. The failure occurs on the next call
1.406 -to new or any of the functions which allocate memory from the heap. This macro
1.407 -is defined only for debug builds.
1.408 -
1.409 -Checking the Kernel heap is only useful when developing Kernel side code such
1.410 -as device drivers and media drivers.
1.411 -
1.412 -@param aCount The rate of failure - heap allocation fails every aCount attempt.
1.413 -
1.414 -@see User::__DbgSetAllocFail()
1.415 -*/
1.416 -#define __KHEAP_FAILNEXT(aCount) User::__DbgSetAllocFail(TRUE,RAllocator::EFailNext,aCount)
1.417 -
1.418 -/**
1.419 -@publishedPartner
1.420 -@released
1.421 -
1.422 -Simulates Kernel heap allocation failures. aBurst failures will occur on the next call
1.423 -to new or any of the functions which allocate memory from the heap. This macro
1.424 -is defined only for debug builds.
1.425 -
1.426 -Checking the Kernel heap is only useful when developing Kernel side code such
1.427 -as device drivers and media drivers.
1.428 -
1.429 -@param aCount The heap allocation will fail after aCount-1 allocation attempts.
1.430 - Note when used with RHeap the maximum value aCount can be set
1.431 - to is KMaxTUint16.
1.432 -@param aBurst The number of allocations that will fail after aCount-1 allocation
1.433 - attempts. Note when used with RHeap the maximum value aBurst can be
1.434 - set to is KMaxTUint16.
1.435 -
1.436 -
1.437 -@see User::__DbgSetBurstAllocFail()
1.438 -*/
1.439 -#define __KHEAP_BURSTFAILNEXT(aCount,aBurst) User::__DbgSetBurstAllocFail(TRUE,RAllocator::EBurstFailNext,aCount,aBurst)
1.440 -
1.441 -
1.442 -/**
1.443 -@publishedPartner
1.444 -@released
1.445 -
1.446 -Simulates Kernel heap allocation failure.
1.447 -
1.448 -The failure occurs on subsequent calls to new or any of the functions which
1.449 -allocate memory from this heap.
1.450 -
1.451 -This macro is defined only for debug builds.
1.452 -
1.453 -@param aType The type of failure to be simulated.
1.454 -@param aRate The failure rate.
1.455 -
1.456 -@see RAllocator::TAllocFail
1.457 -@see User::__DbgSetAllocFail()
1.458 -*/
1.459 -#define __KHEAP_SETFAIL(aType,aRate) User::__DbgSetAllocFail(TRUE,aType,aRate)
1.460 -
1.461 -/**
1.462 -@publishedPartner
1.463 -@released
1.464 -
1.465 -Simulates Kernel heap allocation failure.
1.466 -
1.467 -The failure occurs on subsequent calls to new or any of the functions which
1.468 -allocate memory from this heap.
1.469 -
1.470 -This macro is defined only for debug builds.
1.471 -
1.472 -@param aType The type of failure to be simulated.
1.473 -@param aRate The failure rate. Note when used with RHeap the maximum value
1.474 - aRate can be set to is KMaxTUint16.
1.475 -@param aBurst The number of consecutive allocations that will fail. Note
1.476 - when used with RHeap the maximum value aBurst can be set to
1.477 - is KMaxTUint16.
1.478 -
1.479 -@see RAllocator::TAllocFail
1.480 -@see User::__DbgSetBurstAllocFail()
1.481 -*/
1.482 -#define __KHEAP_SETBURSTFAIL(aType,aRate,aBurst) User::__DbgSetBurstAllocFail(TRUE,aType,aRate,aBurst)
1.483 -
1.484 -
1.485 -
1.486 -/**
1.487 -@publishedPartner
1.488 -@released
1.489 -
1.490 -Cancels simulated Kernel heap allocation failure.
1.491 -
1.492 -Checking the Kernel heap is only useful when developing Kernel side code such
1.493 -as device drivers and media drivers.
1.494 -
1.495 -This macro is defined only for debug builds.
1.496 -
1.497 -@see User::__DbgSetAllocFail()
1.498 -*/
1.499 -#define __KHEAP_RESET User::__DbgSetAllocFail(TRUE,RAllocator::ENone,1)
1.500 -
1.501 -
1.502 -
1.503 -
1.504 -/**
1.505 -@publishedPartner
1.506 -@released
1.507 -
1.508 -Cancels simulated kernel heap allocation failure.
1.509 -It walks the the heap and sets the nesting level for all allocated
1.510 -cells to zero.
1.511 -
1.512 -Checking the kernel heap is only useful when developing kernel side code such
1.513 -as device drivers and media drivers.
1.514 -
1.515 -This macro is defined only for debug builds.
1.516 -*/
1.517 -#define __KHEAP_TOTAL_RESET User::__DbgSetAllocFail(TRUE,RAllocator::EReset,1)
1.518 -
1.519 /**
1.520 @publishedAll
1.521 @released
1.522 @@ -2488,239 +2213,6 @@
1.523 */
1.524 #define __UHEAP_CHECKFAILURE ((TUint)0)
1.525
1.526 -
1.527 -/**
1.528 -@publishedPartner
1.529 -@released
1.530 -
1.531 -Marks the start of Kernel heap checking.
1.532 -
1.533 -Checking the Kernel heap is only useful when developing Kernel side code such
1.534 -as device drivers and media drivers.
1.535 -
1.536 -This macro is defined only for debug builds.
1.537 -
1.538 -This macro must be matched by a corresponding call to __KHEAP_MARKEND or __KHEAP_MARKENDC.
1.539 -Calls to this macro can be nested but each call must be matched by corresponding
1.540 -call to __KHEAP_MARKEND or __KHEAP_MARKENDC.
1.541 -
1.542 -@see User::__DbgMarkStart()
1.543 -@see __KHEAP_MARKEND
1.544 -@see __KHEAP_MARKENDC
1.545 -*/
1.546 -#define __KHEAP_MARK
1.547 -
1.548 -
1.549 -
1.550 -
1.551 -/**
1.552 -@publishedPartner
1.553 -@released
1.554 -
1.555 -Checks that the number of allocated cells at the current nested level of the
1.556 -Kernel heap is the same as the specified value. This macro is defined only
1.557 -for debug builds. Checking the Kernel heap is only useful when developing
1.558 -Kernel side code such as device drivers and media drivers.
1.559 -
1.560 -The macro also takes the name of the file containing this source code statement
1.561 -and the line number of this source code statement; they are displayed as part
1.562 -of the panic category, if the checks fail.
1.563 -
1.564 -@param aCount The number of heap cells expected to be allocated at
1.565 - the current nest level.
1.566 -
1.567 -@see User::__DbgMarkCheck()
1.568 -@see __UHEAP_CHECK
1.569 -*/
1.570 -#define __KHEAP_CHECK(aCount)
1.571 -
1.572 -
1.573 -
1.574 -
1.575 -/**
1.576 -@publishedPartner
1.577 -@released
1.578 -
1.579 -Checks that the total number of allocated cells on the Kernel heap is the same
1.580 -as the specified value.
1.581 -
1.582 -It is only useful when developing Kernel side code such as device drivers
1.583 -and media drivers.
1.584 -
1.585 -The macro also takes the name of the file containing this source code statement
1.586 -and the line number of this source code statement; they are displayed as part
1.587 -of the panic category, if the checks fail.
1.588 -
1.589 -This macro is defined only for debug builds.
1.590 -
1.591 -@param aCount The total number of heap cells expected to be allocated
1.592 -
1.593 -@see User::__DbgMarkCheck()
1.594 -@see __UHEAP_CHECKALL
1.595 -*/
1.596 -#define __KHEAP_CHECKALL(aCount)
1.597 -
1.598 -
1.599 -
1.600 -
1.601 -/**
1.602 -@publishedPartner
1.603 -@released
1.604 -
1.605 -Marks the end of Kernel heap checking. The macro expects zero heap cells to
1.606 -remain allocated at the current nest level.
1.607 -
1.608 -This macro is defined only for debug builds. Checking the Kernel heap is only
1.609 -useful when developing Kernel side code such as device drivers and media drivers.
1.610 -
1.611 -This macro must match an earlier call to __KHEAP_MARK.
1.612 -
1.613 -@see User::__DbgMarkEnd()
1.614 -@see __KHEAP_MARK
1.615 -*/
1.616 -#define __KHEAP_MARKEND
1.617 -
1.618 -
1.619 -
1.620 -
1.621 -/**
1.622 -@publishedPartner
1.623 -@released
1.624 -
1.625 -Marks the end of Kernel heap checking. The macro expects aCount heap cells
1.626 -to remain allocated at the current nest level.
1.627 -
1.628 -This macro is defined only for debug builds.
1.629 -
1.630 -This macro must match an earlier call to __KHEAP_MARK.
1.631 -
1.632 -@param aCount The number of heap cells expected to remain allocated at
1.633 - the current nest level.
1.634 -
1.635 -@see User::__DbgMarkEnd()
1.636 -@see __KHEAP_MARK
1.637 -*/
1.638 -#define __KHEAP_MARKENDC(aCount)
1.639 -
1.640 -
1.641 -
1.642 -
1.643 -/**
1.644 -@publishedPartner
1.645 -@released
1.646 -
1.647 -Simulates Kernel heap allocation failure. The failure occurs on the next call
1.648 -to new or any of the functions which allocate memory from the heap. This macro
1.649 -is defined only for debug builds.
1.650 -
1.651 -Checking the Kernel heap is only useful when developing Kernel side code such
1.652 -as device drivers and media drivers.
1.653 -
1.654 -@param aCount The rate of failure - heap allocation fails every aCount attempt.
1.655 -
1.656 -@see User::__DbgSetAllocFail()
1.657 -*/
1.658 -#define __KHEAP_FAILNEXT(aCount)
1.659 -
1.660 -/**
1.661 -@publishedPartner
1.662 -@released
1.663 -
1.664 -Simulates Kernel heap allocation failures. aBurst failures will occur on the next call
1.665 -to new or any of the functions which allocate memory from the heap. This macro
1.666 -is defined only for debug builds.
1.667 -
1.668 -Checking the Kernel heap is only useful when developing Kernel side code such
1.669 -as device drivers and media drivers.
1.670 -
1.671 -@param aCount The heap allocation will fail after aCount-1 allocation attempts.
1.672 - Note when used with RHeap the maximum value aCount can be set
1.673 - to is KMaxTUint16.
1.674 -@param aBurst The number of allocations that will fail after aCount-1 allocation
1.675 - attempts. Note when used with RHeap the maximum value aBurst can
1.676 - be set to is KMaxTUint16.
1.677 -
1.678 -@see User::__DbgSetBurstAllocFail()
1.679 -*/
1.680 -#define __KHEAP_BURSTFAILNEXT(aCount,aBurst)
1.681 -
1.682 -
1.683 -
1.684 -/**
1.685 -@publishedPartner
1.686 -@released
1.687 -
1.688 -Simulates Kernel heap allocation failure.
1.689 -
1.690 -The failure occurs on subsequent calls to new or any of the functions which
1.691 -allocate memory from this heap.
1.692 -
1.693 -This macro is defined only for debug builds.
1.694 -
1.695 -@param aType The type of failure to be simulated.
1.696 -@param aRate The failure rate.
1.697 -
1.698 -@see User::__DbgSetAllocFail()
1.699 -*/
1.700 -#define __KHEAP_SETFAIL(aType,aRate)
1.701 -
1.702 -/**
1.703 -@publishedPartner
1.704 -@released
1.705 -
1.706 -Simulates Kernel heap allocation failure.
1.707 -
1.708 -The failure occurs on subsequent calls to new or any of the functions which
1.709 -allocate memory from this heap.
1.710 -
1.711 -This macro is defined only for debug builds.
1.712 -
1.713 -@param aType The type of failure to be simulated.
1.714 -@param aRate The failure rate. Note when used with RHeap the maximum value
1.715 - aRate can be set to is KMaxTUint16.
1.716 -@param aBurst The number of consecutive allocations that will fail. Note
1.717 - when used with RHeap the maximum value aBurst can be set
1.718 - to is KMaxTUint16.
1.719 -
1.720 -@see User::__DbgSetBurstAllocFail()
1.721 -*/
1.722 -#define __KHEAP_SETBURSTFAIL(aType,aRate,aBurst)
1.723 -
1.724 -
1.725 -
1.726 -/**
1.727 -@publishedPartner
1.728 -@released
1.729 -
1.730 -Cancels simulated Kernel heap allocation failure.
1.731 -
1.732 -Checking the Kernel heap is only useful when developing Kernel side code such
1.733 -as device drivers and media drivers.
1.734 -
1.735 -This macro is defined only for debug builds.
1.736 -
1.737 -@see User::__DbgSetAllocFail()
1.738 -*/
1.739 -#define __KHEAP_RESET
1.740 -
1.741 -
1.742 -
1.743 -/**
1.744 -@publishedPartner
1.745 -@released
1.746 -
1.747 -Cancels simulated kernel heap allocation failure.
1.748 -It walks the the heap and sets the nesting level for all allocated
1.749 -cells to zero.
1.750 -
1.751 -Checking the kernel heap is only useful when developing kernel side code such
1.752 -as device drivers and media drivers.
1.753 -
1.754 -This macro is defined only for debug builds.
1.755 -*/
1.756 -#define __KHEAP_TOTAL_RESET
1.757 -
1.758 -
1.759 /**
1.760 @publishedAll
1.761 @released
1.762 @@ -3000,16 +2492,6 @@
1.763 #define __EMULATOR_IMAGE_HEADER(aUid0,aUid1,aUid2,aPriority,aCap,aFlags)
1.764 #endif
1.765
1.766 -#if defined(__OPT__)
1.767 -/**
1.768 -@internalComponent
1.769 -@deprecated
1.770 -*/
1.771 -#define __ASSERT_OPT(c,p) (void)((c)||(p,0))
1.772 -#else
1.773 -#define __ASSERT_OPT(c,p)
1.774 -#endif
1.775 -
1.776 #if defined(_UNICODE)
1.777 #if !defined(UNICODE)
1.778 /**
1.779 @@ -3020,19 +2502,6 @@
1.780 #endif
1.781 #endif
1.782
1.783 -#if defined(_DEBUG)
1.784 -/**
1.785 -@internalComponent
1.786 -@deprecated
1.787 -*/
1.788 -#define __DECLARE_TEST_DEBUG __DECLARE_TEST
1.789 -#else
1.790 -#define __DECLARE_TEST_DEBUG
1.791 -#endif
1.792 -
1.793 -
1.794 -
1.795 -
1.796 #if !defined(ASSERT)
1.797 /**
1.798 @publishedAll
1.799 @@ -3049,17 +2518,6 @@
1.800
1.801
1.802
1.803 -#ifndef __VALUE_IN_REGS__
1.804 -/**
1.805 -@publishedPartner
1.806 -@released
1.807 -*/
1.808 -#define __VALUE_IN_REGS__
1.809 -#endif
1.810 -
1.811 -
1.812 -
1.813 -
1.814 #if defined(_DEBUG)
1.815 /**
1.816 @publishedAll
1.817 @@ -3206,7 +2664,7 @@
1.818 When this value is used in Platform Security APIs as the value for the aDiagnostic
1.819 argument, these APIs will not emit any form of diagnostic message.
1.820 @publishedPartner
1.821 -@release
1.822 +@released
1.823 */
1.824 #define KSuppressPlatSecDiagnostic NULL
1.825
1.826 @@ -3223,6 +2681,7 @@
1.827
1.828 #if defined(__VC32__) && (_MSC_VER < 1300)
1.829 #define __PLACEMENT_VEC_NEW_INLINE
1.830 +#define __OMIT_VEC_OPERATOR_NEW_DECL__
1.831 #endif /* version of MSVC that doesn't support overloaded operator new[] */
1.832
1.833 /**
1.834 @@ -3235,4 +2694,8 @@
1.835 #define __SOFTFP
1.836 #endif /* __SOFTFP */
1.837
1.838 +#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
1.839 +#include <e32def_private.h>
1.840 +#endif
1.841 +
1.842 #endif /* __E32DEF_H__ */