diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2009-01-10 16:21:27 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2009-01-10 16:21:27 +0000 |
| commit | e2b6b440e12562804f161d8db677554bbd666bd1 (patch) | |
| tree | 71ceaeec75f2ecf2d1ab601414cb4190f3f44ca0 /src | |
| parent | b7eba42be8e04a6a9cbade60d5ae0190fd34efae (diff) | |
| download | ChibiOS-e2b6b440e12562804f161d8db677554bbd666bd1.tar.gz ChibiOS-e2b6b440e12562804f161d8db677554bbd666bd1.tar.bz2 ChibiOS-e2b6b440e12562804f161d8db677554bbd666bd1.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@612 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'src')
| -rw-r--r-- | src/chsys.c | 2 | ||||
| -rw-r--r-- | src/include/sys.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/chsys.c b/src/chsys.c index 347b75da3..c1666095e 100644 --- a/src/chsys.c +++ b/src/chsys.c @@ -120,7 +120,9 @@ void chSysLock(void) { */ void chSysUnlock(void) { +#ifdef CH_USE_NESTED_LOCKS chDbgAssert(currp->p_locks > 0, "chinit.c, chSysUnlock()"); +#endif chSysUnlockInline(); } #endif /* !CH_OPTIMIZE_SPEED */ diff --git a/src/include/sys.h b/src/include/sys.h index 25cdbed6a..ae6a8dd2a 100644 --- a/src/include/sys.h +++ b/src/include/sys.h @@ -148,7 +148,7 @@ * @note Usually IRQ handlers functions are also declared naked.
* @note On some architectures this macro can be empty.
*/
-#define chSysIRQEnterI() SYS_IRQ_PROLOGUE()
+#define CH_IRQ_PROLOGUE() SYS_IRQ_PROLOGUE()
/**
* IRQ handler exit code.
@@ -156,7 +156,7 @@ * @note This macro usually performs the final reschedulation by using
* \p chSchRescRequiredI() and \p chSchDoRescheduleI().
*/
-#define chSysIRQExitI() SYS_IRQ_EPILOGUE()
+#define CH_IRQ_EPILOGUE() SYS_IRQ_EPILOGUE()
/**
* Standard modifier for IRQ handler functions. |