From 8fa109243e5d626a941db8e7d6dc30bb64f9bc9f Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sat, 24 Jan 2009 17:59:51 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@675 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- docs/ch.txt | 8 ++++---- docs/src/interrupts.dox | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'docs') diff --git a/docs/ch.txt b/docs/ch.txt index 6f99b0f98..d807d23ae 100644 --- a/docs/ch.txt +++ b/docs/ch.txt @@ -127,8 +127,8 @@ * - I-Locked. Kernel locked and regular interrupt sources disabled. * I-Class APIs are invokable from this state. * - Serving Regular Interrupt. No system APIs are accessible but it is - * possible to switch to the I-Locked state using @p chSysLockI() and then - * invoke any I-Class API. Interrupt handlers can be preemptable on some + * possible to switch to the I-Locked state using @p chSysLockFromIsr() and + * then invoke any I-Class API. Interrupt handlers can be preemptable on some * architectures thus is important to switch to I-Locked state before * invoking system APIs. * - Serving Fast Interrupt. System APIs are not accessible. @@ -167,8 +167,8 @@ slock -> ilock [label="Context Switch", dir="both"]; norm -> sri [label="Regular IRQ", style="dotted"]; sri -> norm [label="Regular IRQ return", fontname=Helvetica, fontsize=8]; - sri -> ilock [label="chSysLockI()", constraint=false]; - ilock -> sri [label="chSysUnlockI()", fontsize=8]; + sri -> ilock [label="chSysLockFromIsr()", constraint=false]; + ilock -> sri [label="chSysUnlockFromIsr()", fontsize=8]; norm -> sleep [label="Idle Thread"]; sleep -> sri [label="Regular IRQ", style="dotted"]; } diff --git a/docs/src/interrupts.dox b/docs/src/interrupts.dox index 2a14bd6aa..3ba5d2b9a 100644 --- a/docs/src/interrupts.dox +++ b/docs/src/interrupts.dox @@ -11,9 +11,9 @@ CH_IRQ_HANDLER(myIRQ) { // IRQ handling code, preemptable if the architecture supports it. - chSysLockI(); + chSysLockFromIsr(); // Invocation of some I-Class system APIs, never preemptable. - chSysUnlockI(). + chSysUnlockFromIsr(). // More IRQ handling code, again preemptable. -- cgit v1.2.3