From 52d0b057aedb5107e93aa9c1b3e3a7f06c1ba6dc Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sat, 12 May 2012 06:46:28 +0000
Subject: Fixed bug 3524138.

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

diff --git a/os/hal/platforms/LPC11xx/hal_lld.h b/os/hal/platforms/LPC11xx/hal_lld.h
index e04e7a92e..e0c4af7f6 100644
--- a/os/hal/platforms/LPC11xx/hal_lld.h
+++ b/os/hal/platforms/LPC11xx/hal_lld.h
@@ -120,7 +120,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"
@@ -166,7 +166,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 aad7cbf4d..67903b081 100644
--- a/os/hal/platforms/LPC13xx/hal_lld.h
+++ b/os/hal/platforms/LPC13xx/hal_lld.h
@@ -120,7 +120,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"
@@ -166,7 +166,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 adb92a450..ed1bbfd88 100644
--- a/readme.txt
+++ b/readme.txt
@@ -79,6 +79,8 @@
 *****************************************************************************
 
 *** 2.5.0 ***
+- FIX: Fixed inconsistent LPCxxx Internal RC oscillator names (bug 3524138)
+  (backported to 2.2.10 and 2.4.1).
 - FIX: Fixed wrong frequency limit checks vs VDD in STM32F2xx HAL (bug 3524094)
   (backported to 2.4.1).
 - FIX: Fixed STM32 I2C1 wrong alternate TX DMA setting (bug 3524088)
-- 
cgit v1.2.3