From 56cc87ba13a2794c7214fcab0f19f7153c621578 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Thu, 4 Oct 2012 08:23:45 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4735 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/ports/GCC/ARMCMx/chcore_v6m.c | 2 +- os/ports/GCC/ARMCMx/chcore_v7m.c | 2 +- os/ports/GCC/PPC/rules.mk | 3 +++ os/ports/IAR/ARMCMx/chcore_v6m.c | 2 +- os/ports/IAR/ARMCMx/chcore_v7m.c | 2 +- os/ports/RVCT/ARMCMx/chcore_v6m.c | 2 +- os/ports/RVCT/ARMCMx/chcore_v7m.c | 2 +- 7 files changed, 9 insertions(+), 6 deletions(-) diff --git a/os/ports/GCC/ARMCMx/chcore_v6m.c b/os/ports/GCC/ARMCMx/chcore_v6m.c index 63576cb3d..6bdbbfeb5 100644 --- a/os/ports/GCC/ARMCMx/chcore_v6m.c +++ b/os/ports/GCC/ARMCMx/chcore_v6m.c @@ -118,7 +118,7 @@ void _port_irq_epilogue(regarm_t lr) { } /* Note, returning without unlocking is intentional, this is done in - order to keep the rest of the context switching atomic.*/ + order to keep the rest of the context switch atomic.*/ } } diff --git a/os/ports/GCC/ARMCMx/chcore_v7m.c b/os/ports/GCC/ARMCMx/chcore_v7m.c index d621074f1..08f3fbba1 100644 --- a/os/ports/GCC/ARMCMx/chcore_v7m.c +++ b/os/ports/GCC/ARMCMx/chcore_v7m.c @@ -184,7 +184,7 @@ void _port_irq_epilogue(void) { #endif /* Note, returning without unlocking is intentional, this is done in - order to keep the rest of the context switching atomic.*/ + order to keep the rest of the context switch atomic.*/ return; } port_unlock_from_isr(); diff --git a/os/ports/GCC/PPC/rules.mk b/os/ports/GCC/PPC/rules.mk index 6b49e736a..75f4bf8c8 100644 --- a/os/ports/GCC/PPC/rules.mk +++ b/os/ports/GCC/PPC/rules.mk @@ -23,6 +23,9 @@ ifeq ($(USE_VLE),yes) DDEFS += -DPPC_USE_VLE=1 DADEFS += -DPPC_USE_VLE=1 MCU += -mvle +else + DDEFS += -DPPC_USE_VLE=0 + DADEFS += -DPPC_USE_VLE=0 endif # Source files groups and paths diff --git a/os/ports/IAR/ARMCMx/chcore_v6m.c b/os/ports/IAR/ARMCMx/chcore_v6m.c index f1c9367e7..cc1e1ab6b 100644 --- a/os/ports/IAR/ARMCMx/chcore_v6m.c +++ b/os/ports/IAR/ARMCMx/chcore_v6m.c @@ -118,7 +118,7 @@ void _port_irq_epilogue(regarm_t lr) { } /* Note, returning without unlocking is intentional, this is done in - order to keep the rest of the context switching atomic.*/ + order to keep the rest of the context switch atomic.*/ } } diff --git a/os/ports/IAR/ARMCMx/chcore_v7m.c b/os/ports/IAR/ARMCMx/chcore_v7m.c index ce7f44243..3ceaf1d17 100644 --- a/os/ports/IAR/ARMCMx/chcore_v7m.c +++ b/os/ports/IAR/ARMCMx/chcore_v7m.c @@ -189,7 +189,7 @@ void _port_irq_epilogue(void) { #endif /* Note, returning without unlocking is intentional, this is done in - order to keep the rest of the context switching atomic.*/ + order to keep the rest of the context switch atomic.*/ return; } port_unlock_from_isr(); diff --git a/os/ports/RVCT/ARMCMx/chcore_v6m.c b/os/ports/RVCT/ARMCMx/chcore_v6m.c index bf4bb259a..d01dce56b 100644 --- a/os/ports/RVCT/ARMCMx/chcore_v6m.c +++ b/os/ports/RVCT/ARMCMx/chcore_v6m.c @@ -121,7 +121,7 @@ void _port_irq_epilogue(regarm_t lr) { } /* Note, returning without unlocking is intentional, this is done in - order to keep the rest of the context switching atomic.*/ + order to keep the rest of the context switch atomic.*/ } } diff --git a/os/ports/RVCT/ARMCMx/chcore_v7m.c b/os/ports/RVCT/ARMCMx/chcore_v7m.c index fb11547c6..f7d4afb9d 100644 --- a/os/ports/RVCT/ARMCMx/chcore_v7m.c +++ b/os/ports/RVCT/ARMCMx/chcore_v7m.c @@ -196,7 +196,7 @@ void _port_irq_epilogue(void) { #endif /* Note, returning without unlocking is intentional, this is done in - order to keep the rest of the context switching atomic.*/ + order to keep the rest of the context switch atomic.*/ return; } port_unlock_from_isr(); -- cgit v1.2.3