# HG changeset patch
# User asl
# Date 1236026056 0
# Node ID fbf38a65f4e14712d7e21cecaa25eb9a48d7f0bd
# Parent  d89a70a454d81fa46f1e295698bbf966e22504a3
        * cdl/hal_arm_lpc2xxx_olpch2294.cdl: Expanded a list the legal baud
        rates for both diagnostic and debug channels (upon 230400 bps).
        * include/hal_platform_setup.h: Fixed a comment about JTAG pinouts.
        * src/olpch2294_misc.c: 1) hal_plf_hardware_init(): masked interrupts
        on UART1; 2) Removed odd _impure_ptr stub.

diff --git a/packages/hal/arm/lpc2xxx/olpch2294/current/ChangeLog b/packages/hal/arm/lpc2xxx/olpch2294/current/ChangeLog
--- a/packages/hal/arm/lpc2xxx/olpch2294/current/ChangeLog
+++ b/packages/hal/arm/lpc2xxx/olpch2294/current/ChangeLog
@@ -1,3 +1,11 @@
+2009-02-02  Sergei Gavrikov <sergei.gavrikov@gmail.com>
+
+ 	* cdl/hal_arm_lpc2xxx_olpch2294.cdl: Expanded a list the legal baud
+ 	rates for both diagnostic and debug channels (upon 230400 bps).
+ 	* include/hal_platform_setup.h: Fixed a comment about JTAG pinouts.
+ 	* src/olpch2294_misc.c: 1) hal_plf_hardware_init(): masked interrupts
+ 	on UART1; 2) Removed odd _impure_ptr stub.
+ 
 2009-01-31  Bart Veer <bartv@ecoscentric.com>
 
 	* cdl/hal_arm_lpc2xxx_olpch2294.cdl: update compiler flags for gcc 4.x
diff --git a/packages/hal/arm/lpc2xxx/olpch2294/current/cdl/hal_arm_lpc2xxx_olpch2294.cdl b/packages/hal/arm/lpc2xxx/olpch2294/current/cdl/hal_arm_lpc2xxx_olpch2294.cdl
--- a/packages/hal/arm/lpc2xxx/olpch2294/current/cdl/hal_arm_lpc2xxx_olpch2294.cdl
+++ b/packages/hal/arm/lpc2xxx/olpch2294/current/cdl/hal_arm_lpc2xxx_olpch2294.cdl
@@ -115,7 +115,7 @@ cdl_package CYGPKG_HAL_ARM_LPC2XXX_OLPCH
      cdl_option CYGNUM_HAL_VIRTUAL_VECTOR_CONSOLE_CHANNEL_BAUD {
         display       "Diagnostic serial port baud rate"
         flavor        data
-        legal_values  9600 19200 38400 57600 115200
+        legal_values  9600 19200 38400 57600 115200 230400
         default_value 38400
         description   "
             This option selects the baud rate used for the diagnostic
@@ -125,7 +125,7 @@ cdl_package CYGPKG_HAL_ARM_LPC2XXX_OLPCH
     cdl_option CYGNUM_HAL_VIRTUAL_VECTOR_DEBUG_CHANNEL_BAUD {
          display       "GDB serial port baud rate"
          flavor        data
-         legal_values  9600 19200 38400 57600 115200
+         legal_values  9600 19200 38400 57600 115200 230400
          default_value 38400
          description   "
             This option controls the baud rate used for the GDB
diff --git a/packages/hal/arm/lpc2xxx/olpch2294/current/include/hal_platform_setup.h b/packages/hal/arm/lpc2xxx/olpch2294/current/include/hal_platform_setup.h
--- a/packages/hal/arm/lpc2xxx/olpch2294/current/include/hal_platform_setup.h
+++ b/packages/hal/arm/lpc2xxx/olpch2294/current/include/hal_platform_setup.h
@@ -175,7 +175,7 @@ 1:
         str r1,[r0,#CYGARC_HAL_LPC2XXX_REG_PINSEL1]
 
         // GPIO P1.25:16, P3.0, P3.25:24 are used as PIO
-        ldr r1,=  (0x1 << 2)    /* P1.36:26 Debug port  */\
+        ldr r1,=  (0x1 << 2)    /* P1.31:26 Debug port  */\
                 | (0x2 << 4)    /* D31:0,CS0,OE,BLS0-3  */\
                 | (0x1 << 8)    /* WE enabled           */\
                 | (0x1 << 11)   /* CS1 enabled          */\
diff --git a/packages/hal/arm/lpc2xxx/olpch2294/current/src/olpch2294_misc.c b/packages/hal/arm/lpc2xxx/olpch2294/current/src/olpch2294_misc.c
--- a/packages/hal/arm/lpc2xxx/olpch2294/current/src/olpch2294_misc.c
+++ b/packages/hal/arm/lpc2xxx/olpch2294/current/src/olpch2294_misc.c
@@ -51,15 +51,11 @@
 
 #include <pkgconf/hal.h>
 #include <cyg/hal/hal_io.h>     // IO macros
+#include <cyg/hal/hal_intr.h>
 
 #include <cyg/infra/cyg_type.h> // base types
 #include <cyg/hal/var_io.h>
 
-// Newlib provides support for building the run-time elements of C++
-// within the toolchain. Modern newlib stuff looks for a _impure_ptr
-// entry.
-void           *_impure_ptr;
-
 extern void     cyg_hal_plf_serial_init (void);
 
 // There is alone diagnostic LED on the board.
@@ -104,7 +100,9 @@ cyg_hal_plf_comms_init (void)
 void
 hal_plf_hardware_init (void)
 {
-    // Currently, it does nothing
+    // Platform HAL does not use the second LPC2XXX UART. To be sure that we
+    // won't meet any spurios interrupts on UART1 anymore, mask that vector.
+    HAL_INTERRUPT_MASK(CYGNUM_HAL_INTERRUPT_UART1);
 }
 #endif // HAL_PLF_HARDWARE_INIT