git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1856 35acf78f-673a-0410-8e92-d51de3d6d3f4

8 files changed, 54 insertions, 54 deletions

diff --git a/os/hal/platforms/LPC11xx/hal_lld.c b/os/hal/platforms/LPC11xx/hal_lld.c
index 976fed23b..e7077cad9 100644
--- a/os/hal/platforms/LPC11xx/hal_lld.c
+++ b/os/hal/platforms/LPC11xx/hal_lld.c
@@ -18,10 +18,10 @@
 */

 

 /**

- * @file    LPC111x/hal_lld.c

- * @brief   LPC111x HAL subsystem low level driver source.

+ * @file    LPC11xx/hal_lld.c

+ * @brief   LPC11xx HAL subsystem low level driver source.

  *

- * @addtogroup LPC111x_HAL

+ * @addtogroup LPC11xx_HAL

  * @{

  */

 

@@ -79,7 +79,7 @@ void hal_lld_init(void) {
 }

 

 /**

- * @brief   LPC111x clocks and PLL initialization.

+ * @brief   LPC11xx clocks and PLL initialization.

  * @note    All the involved constants come from the file @p board.h.

  */

 void lpc111x_clock_init(void) {

diff --git a/os/hal/platforms/LPC11xx/hal_lld.h b/os/hal/platforms/LPC11xx/hal_lld.h
index 523eb0a6f..521029139 100644
--- a/os/hal/platforms/LPC11xx/hal_lld.h
+++ b/os/hal/platforms/LPC11xx/hal_lld.h
@@ -18,10 +18,10 @@
 */

 

 /**

- * @file    LPC111x/hal_lld.h

+ * @file    LPC11xx/hal_lld.h

  * @brief   HAL subsystem low level driver header template.

  *

- * @addtogroup LPC111x_HAL

+ * @addtogroup LPC11xx_HAL

  * @{

  */

 

@@ -38,7 +38,7 @@
 /**

  * @brief   Platform name.

  */

-#define PLATFORM_NAME           "LPC111x"

+#define PLATFORM_NAME           "LPC11xx"

 

 #define IRCOSCCLK               12000000    /**< High speed internal clock. */

 #define WDGOSCCLK               1600000     /**< Watchdog internal clock.   */

diff --git a/os/hal/platforms/LPC11xx/pal_lld.c b/os/hal/platforms/LPC11xx/pal_lld.c
index 2054cd271..7c04673ca 100644
--- a/os/hal/platforms/LPC11xx/pal_lld.c
+++ b/os/hal/platforms/LPC11xx/pal_lld.c
@@ -18,10 +18,10 @@
 */

 

 /**

- * @file    LPC111x/pal_lld.c

- * @brief   LPC111x GPIO low level driver code.

+ * @file    LPC11xx/pal_lld.c

+ * @brief   LPC11xx GPIO low level driver code.

  *

- * @addtogroup LPC111x_PAL

+ * @addtogroup LPC11xx_PAL

  * @{

  */

 

@@ -50,10 +50,10 @@
 /* Driver exported functions.                                                */

 /*===========================================================================*/

 /**

- * @brief LPC111x I/O ports configuration.

+ * @brief LPC11xx I/O ports configuration.

  * @details GPIO unit registers initialization.

  *

- * @param[in] config the LPC111x ports configuration

+ * @param[in] config the LPC11xx ports configuration

  */

 void _pal_lld_init(const PALConfig *config) {

 

diff --git a/os/hal/platforms/LPC11xx/pal_lld.h b/os/hal/platforms/LPC11xx/pal_lld.h
index 8b871721d..a1bff17f3 100644
--- a/os/hal/platforms/LPC11xx/pal_lld.h
+++ b/os/hal/platforms/LPC11xx/pal_lld.h
@@ -18,10 +18,10 @@
 */

 

 /**

- * @file    LPC111x/pal_lld.h

- * @brief   LPC111x GPIO low level driver header.

+ * @file    LPC11xx/pal_lld.h

+ * @brief   LPC11xx GPIO low level driver header.

  *

- * @addtogroup LPC111x_PAL

+ * @addtogroup LPC11xx_PAL

  * @{

  */

 

diff --git a/os/hal/platforms/LPC11xx/platform.dox b/os/hal/platforms/LPC11xx/platform.dox
index 11df786db..3114d8732 100644
--- a/os/hal/platforms/LPC11xx/platform.dox
+++ b/os/hal/platforms/LPC11xx/platform.dox
@@ -18,9 +18,9 @@
 */

 

 /**

- * @defgroup LPC111x LPC111x Support

- * @brief LPC111x specific support.

- * @details The LPC111x support includes:

+ * @defgroup LPC11xx LPC11xx Support

+ * @brief LPC11xx specific support.

+ * @details The LPC11xx support includes:

  * - I/O ports driver.

  * - Buffered, interrupt driven, serial driver.

  * - A demo supporting the kernel test suite.

@@ -29,16 +29,16 @@
  */

 

 /**

- * @defgroup LPC111x_HAL LPC111x HAL Support

+ * @defgroup LPC11xx_HAL LPC11xx HAL Support

  * @brief HAL support.

  *

- * @ingroup LPC111x

+ * @ingroup LPC11xx

  */

 

 /**

- * @defgroup LPC111x_PAL LPC111x I/O Ports Support

+ * @defgroup LPC11xx_PAL LPC11xx I/O Ports Support

  * @brief I/O Ports peripherals support.

- * @details This module supports the LPC111x GPIO controller. The controller

+ * @details This module supports the LPC11xx GPIO controller. The controller

  * supports the following features (see @ref PAL):

  * - 12 bits wide ports.

  * - Atomic set/reset functions.

@@ -63,14 +63,14 @@
  * - Reading of the output latch for pads programmed as input is not possible,

  *   the input pin value is returned instead.

  * .

- * @ingroup LPC111x

+ * @ingroup LPC11xx

  */

 

 /**

- * @defgroup LPC111x_SERIAL LPC111x UART Support

+ * @defgroup LPC11xx_SERIAL LPC11xx UART Support

  * @brief UART peripherals support.

- * @details The serial driver supports the LPC111x UART taking advantage of

+ * @details The serial driver supports the LPC11xx UART taking advantage of

  *          its deep hardware buffers.

  *

- * @ingroup LPC111x

+ * @ingroup LPC11xx

  */

diff --git a/os/hal/platforms/LPC11xx/platform.mk b/os/hal/platforms/LPC11xx/platform.mk
index 99b6a10ba..6bff6ed5f 100644
--- a/os/hal/platforms/LPC11xx/platform.mk
+++ b/os/hal/platforms/LPC11xx/platform.mk
@@ -1,7 +1,7 @@
-# List of all the LPC111x platform files.

-PLATFORMSRC = ${CHIBIOS}/os/hal/platforms/LPC111x/hal_lld.c \

-              ${CHIBIOS}/os/hal/platforms/LPC111x/pal_lld.c \

-              ${CHIBIOS}/os/hal/platforms/LPC111x/serial_lld.c

+# List of all the LPC11xx platform files.

+PLATFORMSRC = ${CHIBIOS}/os/hal/platforms/LPC11xx/hal_lld.c \

+              ${CHIBIOS}/os/hal/platforms/LPC11xx/pal_lld.c \

+              ${CHIBIOS}/os/hal/platforms/LPC11xx/serial_lld.c

 

 # Required include directories

-PLATFORMINC = ${CHIBIOS}/os/hal/platforms/LPC111x

+PLATFORMINC = ${CHIBIOS}/os/hal/platforms/LPC11xx

diff --git a/os/hal/platforms/LPC11xx/serial_lld.c b/os/hal/platforms/LPC11xx/serial_lld.c
index e77a47bb2..cc6146c3c 100644
--- a/os/hal/platforms/LPC11xx/serial_lld.c
+++ b/os/hal/platforms/LPC11xx/serial_lld.c
@@ -18,10 +18,10 @@
 */

 

 /**

- * @file    LPC111x/serial_lld.c

- * @brief   LPC111x low level serial driver code.

+ * @file    LPC11xx/serial_lld.c

+ * @brief   LPC11xx low level serial driver code.

  *

- * @addtogroup LPC111x_SERIAL

+ * @addtogroup LPC11xx_SERIAL

  * @{

  */

 

@@ -34,7 +34,7 @@
 /* Driver exported variables.                                                */

 /*===========================================================================*/

 

-#if USE_LPC111x_UART0 || defined(__DOXYGEN__)

+#if USE_LPC11xx_UART0 || defined(__DOXYGEN__)

 /** @brief UART0 serial driver identifier.*/

 SerialDriver SD1;

 #endif

@@ -148,7 +148,7 @@ static void serve_interrupt(SerialDriver *sdp) {
       break;

     case IIR_SRC_TX:

       {

-        int i = LPC111x_UART_FIFO_PRELOAD;

+        int i = LPC11xx_UART_FIFO_PRELOAD;

         do {

           msg_t b;

 

@@ -180,7 +180,7 @@ static void preload(SerialDriver *sdp) {
   LPC_UART_TypeDef *u = sdp->uart;

 

   if (u->LSR & LSR_THRE) {

-    int i = LPC111x_UART_FIFO_PRELOAD;

+    int i = LPC11xx_UART_FIFO_PRELOAD;

     do {

       msg_t b = chOQGetI(&sdp->oqueue);

       if (b < Q_OK) {

@@ -196,7 +196,7 @@ static void preload(SerialDriver *sdp) {
 /**

  * @brief   Driver SD1 output notification.

  */

-#if USE_LPC111x_UART0 || defined(__DOXYGEN__)

+#if USE_LPC11xx_UART0 || defined(__DOXYGEN__)

 static void notify1(void) {

 

   preload(&SD1);

@@ -210,7 +210,7 @@ static void notify1(void) {
 /**

  * @brief   UART0 IRQ handler.

  */

-#if USE_LPC111x_UART0 || defined(__DOXYGEN__)

+#if USE_LPC11xx_UART0 || defined(__DOXYGEN__)

 CH_IRQ_HANDLER(Vector94) {

 

   CH_IRQ_PROLOGUE();

@@ -230,7 +230,7 @@ CH_IRQ_HANDLER(Vector94) {
  */

 void sd_lld_init(void) {

 

-#if USE_LPC111x_UART0

+#if USE_LPC11xx_UART0

   sdObjectInit(&SD1, NULL, notify1);

   SD1.uart = LPC_UART;

   LPC_IOCON->PIO1_6 = 0xC1;                 /* RDX without resistors.       */

@@ -249,11 +249,11 @@ void sd_lld_start(SerialDriver *sdp) {
     sdp->config = &default_config;

 

   if (sdp->state == SD_STOP) {

-#if USE_LPC111x_UART0

+#if USE_LPC11xx_UART0

     if (&SD1 == sdp) {

       LPC_SYSCON->SYSAHBCLKCTRL |= (1 << 12);

       NVICEnableVector(UART_IRQn,

-                       CORTEX_PRIORITY_MASK(LPC111x_UART0_PRIORITY));

+                       CORTEX_PRIORITY_MASK(LPC11xx_UART0_PRIORITY));

     }

 #endif

   }

@@ -271,7 +271,7 @@ void sd_lld_stop(SerialDriver *sdp) {
 

   if (sdp->state == SD_READY) {

     uart_deinit(sdp->uart);

-#if USE_LPC111x_UART0

+#if USE_LPC11xx_UART0

     if (&SD1 == sdp) {

       LPC_SYSCON->SYSAHBCLKCTRL &= ~(1 << 12);

       NVICDisableVector(UART_IRQn);

diff --git a/os/hal/platforms/LPC11xx/serial_lld.h b/os/hal/platforms/LPC11xx/serial_lld.h
index f67c5404f..e14cea679 100644
--- a/os/hal/platforms/LPC11xx/serial_lld.h
+++ b/os/hal/platforms/LPC11xx/serial_lld.h
@@ -18,10 +18,10 @@
 */

 

 /**

- * @file    LPC111x/serial_lld.h

- * @brief   LPC111x low level serial driver header.

+ * @file    LPC11xx/serial_lld.h

+ * @brief   LPC11xx low level serial driver header.

  *

- * @addtogroup LPC111x_SERIAL

+ * @addtogroup LPC11xx_SERIAL

  * @{

  */

 

@@ -88,8 +88,8 @@
  * @details If set to @p TRUE the support for UART0 is included.

  * @note The default is @p TRUE .

  */

-#if !defined(USE_LPC111x_UART0) || defined(__DOXYGEN__)

-#define USE_LPC111x_UART0           TRUE

+#if !defined(USE_LPC11xx_UART0) || defined(__DOXYGEN__)

+#define USE_LPC11xx_UART0           TRUE

 #endif

 

 /**

@@ -101,22 +101,22 @@
  *       also increase the worst case interrupt response time because the

  *       preload loops.

  */

-#if !defined(LPC111x_UART_FIFO_PRELOAD) || defined(__DOXYGEN__)

-#define LPC111x_UART_FIFO_PRELOAD   16

+#if !defined(LPC11xx_UART_FIFO_PRELOAD) || defined(__DOXYGEN__)

+#define LPC11xx_UART_FIFO_PRELOAD   16

 #endif

 

 /**

  * @brief UART0 interrupt priority level setting.

  */

-#if !defined(LPC111x_UART0_PRIORITY) || defined(__DOXYGEN__)

-#define LPC111x_UART0_PRIORITY      3

+#if !defined(LPC11xx_UART0_PRIORITY) || defined(__DOXYGEN__)

+#define LPC11xx_UART0_PRIORITY      3

 #endif

 

 /*===========================================================================*/

 /* Derived constants and error checks.                                       */

 /*===========================================================================*/

 

-#if (LPC111x_UART_FIFO_PRELOAD < 1) || (LPC111x_UART_FIFO_PRELOAD > 16)

+#if (LPC11xx_UART_FIFO_PRELOAD < 1) || (LPC11xx_UART_FIFO_PRELOAD > 16)

 #error "invalid LPC214x_UART_FIFO_PRELOAD setting"

 #endif

 

@@ -182,7 +182,7 @@ typedef struct {
 /* External declarations.                                                    */

 /*===========================================================================*/

 

-#if USE_LPC111x_UART0 && !defined(__DOXYGEN__)

+#if USE_LPC11xx_UART0 && !defined(__DOXYGEN__)

 extern SerialDriver SD1;

 #endif