From 5caa23648cd29dfdd73273df427b16264cf1e56d Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sat, 12 May 2012 06:46:15 +0000
Subject: [PATCH] Fixed bug 3524138.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_2.4.x@4188 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/hal/platforms/LPC11xx/hal_lld.h | 4 ++--
 os/hal/platforms/LPC13xx/hal_lld.h | 4 ++--
 readme.txt                         | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/os/hal/platforms/LPC11xx/hal_lld.h b/os/hal/platforms/LPC11xx/hal_lld.h
index 61713a245..9025278ae 100644
--- a/os/hal/platforms/LPC11xx/hal_lld.h
+++ b/os/hal/platforms/LPC11xx/hal_lld.h
@@ -127,7 +127,7 @@
  */
 #if (LPC11xx_PLLCLK_SOURCE == SYSPLLCLKSEL_SYSOSC) || defined(__DOXYGEN__)
 #define LPC11xx_SYSPLLCLKIN     SYSOSCCLK
-#elif LPC11xx_PLLCLK_SOURCE == SYSPLLCLKSEL_IRCOCS
+#elif LPC11xx_PLLCLK_SOURCE == SYSPLLCLKSEL_IRCOSC
 #define LPC11xx_SYSPLLCLKIN     IRCOSCCLK
 #else
 #error "invalid LPC11xx_PLLCLK_SOURCE clock source specified"
@@ -173,7 +173,7 @@
  */
 #define  LPC11xx_SYSPLLCLKOUT   (LPC11xx_SYSPLLCCO / LPC11xx_SYSPLL_DIV)
 
-#if (LPC11xx_MAINCLK_SOURCE == SYSMAINCLKSEL_IRCOCS) || defined(__DOXYGEN__)
+#if (LPC11xx_MAINCLK_SOURCE == SYSMAINCLKSEL_IRCOSC) || defined(__DOXYGEN__)
 #define LPC11xx_MAINCLK     IRCOSCCLK
 #elif LPC11xx_MAINCLK_SOURCE == SYSMAINCLKSEL_PLLIN
 #define LPC11xx_MAINCLK     LPC11xx_SYSPLLCLKIN
diff --git a/os/hal/platforms/LPC13xx/hal_lld.h b/os/hal/platforms/LPC13xx/hal_lld.h
index bcfef1138..252b302ef 100644
--- a/os/hal/platforms/LPC13xx/hal_lld.h
+++ b/os/hal/platforms/LPC13xx/hal_lld.h
@@ -127,7 +127,7 @@
  */
 #if (LPC13xx_PLLCLK_SOURCE == SYSPLLCLKSEL_SYSOSC) || defined(__DOXYGEN__)
 #define LPC13xx_SYSPLLCLKIN     SYSOSCCLK
-#elif LPC13xx_PLLCLK_SOURCE == SYSPLLCLKSEL_IRCOCS
+#elif LPC13xx_PLLCLK_SOURCE == SYSPLLCLKSEL_IRCOSC
 #define LPC13xx_SYSPLLCLKIN     IRCOSCCLK
 #else
 #error "invalid LPC13xx_PLLCLK_SOURCE clock source specified"
@@ -173,7 +173,7 @@
  */
 #define  LPC13xx_SYSPLLCLKOUT   (LPC13xx_SYSPLLCCO / LPC13xx_SYSPLL_DIV)
 
-#if (LPC13xx_MAINCLK_SOURCE == SYSMAINCLKSEL_IRCOCS) || defined(__DOXYGEN__)
+#if (LPC13xx_MAINCLK_SOURCE == SYSMAINCLKSEL_IRCOSC) || defined(__DOXYGEN__)
 #define LPC13xx_MAINCLK     IRCOSCCLK
 #elif LPC13xx_MAINCLK_SOURCE == SYSMAINCLKSEL_PLLIN
 #define LPC13xx_MAINCLK     LPC13xx_SYSPLLCLKIN
diff --git a/readme.txt b/readme.txt
index 103323dd4..2db8a773e 100644
--- a/readme.txt
+++ b/readme.txt
@@ -79,6 +79,7 @@
 *****************************************************************************
 
 *** 2.4.1 ***
+- FIX: Fixed inconsistent LPCxxx Internal RC oscillator names (bug 3524138).
 - FIX: Fixed wrong frequency limit checks vs VDD in STM32F2xx HAL (bug
   3524094).
 - FIX: Fixed STM32 I2C1 wrong alternate TX DMA setting (bug 3524088).