From a9d332ad9db2e4ec387f65f5eaaedeb25e1a21a2 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Mon, 30 Apr 2012 16:59:30 +0000 Subject: [PATCH] Fixed bug 3515531. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_2.4.x@4152 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- demos/ARM7-AT91SAM7X-LWIP-GCC/lwip/lwipthread.c | 2 +- demos/ARMCM3-STM32F103ZG-FATFS/main.c | 4 ++-- demos/AVR-AT90CANx-GCC/Makefile | 4 ++-- demos/AVR-ATmega128-GCC/Makefile | 4 ++-- os/kernel/src/chmtx.c | 2 +- os/ports/GCC/ARMCMx/chcore.h | 2 +- os/ports/IAR/ARMCMx/chcore.h | 2 +- os/ports/RVCT/ARMCMx/chcore.h | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/demos/ARM7-AT91SAM7X-LWIP-GCC/lwip/lwipthread.c b/demos/ARM7-AT91SAM7X-LWIP-GCC/lwip/lwipthread.c index 17c1f59a1..7c90e945c 100644 --- a/demos/ARM7-AT91SAM7X-LWIP-GCC/lwip/lwipthread.c +++ b/demos/ARM7-AT91SAM7X-LWIP-GCC/lwip/lwipthread.c @@ -103,7 +103,7 @@ static void low_level_init(struct netif *netif) { netif->mtu = 1500; /* device capabilities */ - /* don't set NETIF_FLAG_ETHARP if this device is not an ethernet one */ + /* don't set NETIF_FLAG_ETHARP if this device is not an Ethernet one */ netif->flags = NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP | NETIF_FLAG_LINK_UP; /* Do whatever else is needed to initialize interface. */ diff --git a/demos/ARMCM3-STM32F103ZG-FATFS/main.c b/demos/ARMCM3-STM32F103ZG-FATFS/main.c index a935755c9..663e4a477 100644 --- a/demos/ARMCM3-STM32F103ZG-FATFS/main.c +++ b/demos/ARMCM3-STM32F103ZG-FATFS/main.c @@ -60,7 +60,7 @@ static unsigned cnt; static EventSource inserted_event, removed_event; /** - * @brief Inserion monitor function. + * @brief Insertion monitor function. * * @param[in] sdcp pointer to the @p SDCDriver object * @@ -87,7 +87,7 @@ bool_t sdc_lld_is_write_protected(SDCDriver *sdcp) { } /** - * @brief Inserion monitor timer callback function. + * @brief Insertion monitor timer callback function. * * @param[in] p pointer to the @p SDCDriver object * diff --git a/demos/AVR-AT90CANx-GCC/Makefile b/demos/AVR-AT90CANx-GCC/Makefile index 11e902b59..fa9309e2f 100644 --- a/demos/AVR-AT90CANx-GCC/Makefile +++ b/demos/AVR-AT90CANx-GCC/Makefile @@ -128,7 +128,7 @@ DEBUG = dwarf-2 # List any extra directories to look for include files here. -# Each directory must be seperated by a space. +# Each directory must be separated by a space. # Use forward slashes for directory separators. # For a directory that has spaces, enclose it in quotes. EXTRAINCDIRS = $(PORTINC) $(KERNINC) $(TESTINC) \ @@ -254,7 +254,7 @@ MATH_LIB = -lm # List any extra directories to look for libraries here. -# Each directory must be seperated by a space. +# Each directory must be separated by a space. # Use forward slashes for directory separators. # For a directory that has spaces, enclose it in quotes. EXTRALIBDIRS = diff --git a/demos/AVR-ATmega128-GCC/Makefile b/demos/AVR-ATmega128-GCC/Makefile index 3f42dce8e..0ea8e8cff 100644 --- a/demos/AVR-ATmega128-GCC/Makefile +++ b/demos/AVR-ATmega128-GCC/Makefile @@ -128,7 +128,7 @@ DEBUG = dwarf-2 # List any extra directories to look for include files here. -# Each directory must be seperated by a space. +# Each directory must be separated by a space. # Use forward slashes for directory separators. # For a directory that has spaces, enclose it in quotes. EXTRAINCDIRS = $(PORTINC) $(KERNINC) $(TESTINC) \ @@ -254,7 +254,7 @@ MATH_LIB = -lm # List any extra directories to look for libraries here. -# Each directory must be seperated by a space. +# Each directory must be separated by a space. # Use forward slashes for directory separators. # For a directory that has spaces, enclose it in quotes. EXTRALIBDIRS = diff --git a/os/kernel/src/chmtx.c b/os/kernel/src/chmtx.c index 6c1f2de43..2c31071a6 100644 --- a/os/kernel/src/chmtx.c +++ b/os/kernel/src/chmtx.c @@ -265,7 +265,7 @@ Mutex *chMtxUnlock(void) { chDbgAssert(ctp->p_mtxlist->m_owner == ctp, "chMtxUnlock(), #2", "ownership failure"); - /* Removes the top Mutex from the Thread's owned mutexes list and matk it + /* Removes the top Mutex from the Thread's owned mutexes list and mark it as not owned.*/ ump = ctp->p_mtxlist; ctp->p_mtxlist = ump->m_next; diff --git a/os/ports/GCC/ARMCMx/chcore.h b/os/ports/GCC/ARMCMx/chcore.h index a60bc1914..aa74c4d7a 100644 --- a/os/ports/GCC/ARMCMx/chcore.h +++ b/os/ports/GCC/ARMCMx/chcore.h @@ -172,7 +172,7 @@ struct intctx {}; #if (CH_TIME_QUANTUM > 0) || defined(__DOXYGEN__) /** - * @brief Inlineable version of this kernel function. + * @brief Inline-able version of this kernel function. */ #define chSchIsPreemptionRequired() \ (rlist.r_preempt ? firstprio(&rlist.r_queue) > currp->p_prio : \ diff --git a/os/ports/IAR/ARMCMx/chcore.h b/os/ports/IAR/ARMCMx/chcore.h index 85744b5b7..e9f72b13b 100644 --- a/os/ports/IAR/ARMCMx/chcore.h +++ b/os/ports/IAR/ARMCMx/chcore.h @@ -173,7 +173,7 @@ struct intctx {}; #if (CH_TIME_QUANTUM > 0) || defined(__DOXYGEN__) /** - * @brief Inlineable version of this kernel function. + * @brief Inline-able version of this kernel function. */ #define chSchIsPreemptionRequired() \ (rlist.r_preempt ? firstprio(&rlist.r_queue) > currp->p_prio : \ diff --git a/os/ports/RVCT/ARMCMx/chcore.h b/os/ports/RVCT/ARMCMx/chcore.h index 1fde10a48..64df4c582 100644 --- a/os/ports/RVCT/ARMCMx/chcore.h +++ b/os/ports/RVCT/ARMCMx/chcore.h @@ -172,7 +172,7 @@ struct intctx {}; #if (CH_TIME_QUANTUM > 0) || defined(__DOXYGEN__) /** - * @brief Inlineable version of this kernel function. + * @brief Inline-able version of this kernel function. */ #define chSchIsPreemptionRequired() \ (rlist.r_preempt ? firstprio(&rlist.r_queue) > currp->p_prio : \