diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-08-19 04:12:33 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-08-19 04:12:33 +0000 |
| commit | 3ac86afb7d50751162712d5d7bb1324998d61982 (patch) | |
| tree | 47a9e8f97b8fc358641969416aa6b02f8a54a130 /nuttx/arch | |
| parent | 45cd8d21a57918b35f458aacda65fdb0572fafa4 (diff) | |
| download | nuttx-3ac86afb7d50751162712d5d7bb1324998d61982.tar.gz nuttx-3ac86afb7d50751162712d5d7bb1324998d61982.tar.bz2 nuttx-3ac86afb7d50751162712d5d7bb1324998d61982.zip | |
Fix Kinetics UART watermark setting
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3894 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch')
| -rw-r--r-- | nuttx/arch/arm/include/kinetis/irq.h | 2 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/armv7-m/up_doirq.c | 2 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/kinetis/kinetis_lowputc.c | 6 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/kinetis/kinetis_serial.c | 8 |
4 files changed, 9 insertions, 9 deletions
diff --git a/nuttx/arch/arm/include/kinetis/irq.h b/nuttx/arch/arm/include/kinetis/irq.h index c16d15eb0..af10ce6f4 100644 --- a/nuttx/arch/arm/include/kinetis/irq.h +++ b/nuttx/arch/arm/include/kinetis/irq.h @@ -75,7 +75,7 @@ /* External interrupts (vectors >= 16) */ -#define KINETIS_IRQ_EXTINT (16) +#define KINETIS_IRQ_EXTINT (16) /* K40 Family *********************************************************************** * diff --git a/nuttx/arch/arm/src/armv7-m/up_doirq.c b/nuttx/arch/arm/src/armv7-m/up_doirq.c index ca115c356..7ac1ec34d 100644 --- a/nuttx/arch/arm/src/armv7-m/up_doirq.c +++ b/nuttx/arch/arm/src/armv7-m/up_doirq.c @@ -88,7 +88,7 @@ uint32_t *up_doirq(int irq, uint32_t *regs) * current_regs is also used to manage interrupt level context switches. */ - savestate = (uint32_t*)current_regs; + savestate = (uint32_t*)current_regs; current_regs = regs; /* Mask and acknowledge the interrupt */ diff --git a/nuttx/arch/arm/src/kinetis/kinetis_lowputc.c b/nuttx/arch/arm/src/kinetis/kinetis_lowputc.c index bf987b177..5529443c3 100644 --- a/nuttx/arch/arm/src/kinetis/kinetis_lowputc.c +++ b/nuttx/arch/arm/src/kinetis/kinetis_lowputc.c @@ -424,10 +424,10 @@ void kinetis_uartconfigure(uintptr_t uart_base, uint32_t baud, putreg8(UART_PFIFO_RXFE | UART_PFIFO_TXFE, uart_base+KINETIS_UART_PFIFO_OFFSET); #else - /* Set the watermarks to zero and disable the FIFOs */ + /* Set the watermarks to one and disable the FIFOs */ - putreg8(0, uart_base+KINETIS_UART_RWFIFO_OFFSET); - putreg8(0, uart_base+KINETIS_UART_TWFIFO_OFFSET); + putreg8(1, uart_base+KINETIS_UART_RWFIFO_OFFSET); + putreg8(1, uart_base+KINETIS_UART_TWFIFO_OFFSET); putreg8(0, uart_base+KINETIS_UART_PFIFO_OFFSET); #endif diff --git a/nuttx/arch/arm/src/kinetis/kinetis_serial.c b/nuttx/arch/arm/src/kinetis/kinetis_serial.c index 0cb2d89e1..1e98b722f 100644 --- a/nuttx/arch/arm/src/kinetis/kinetis_serial.c +++ b/nuttx/arch/arm/src/kinetis/kinetis_serial.c @@ -682,7 +682,7 @@ static int up_attach(struct uart_dev_s *dev) } #endif - if (ret == 0) + if (ret == OK) { #ifdef CONFIG_DEBUG up_enable_irq(priv->irqe); @@ -1300,9 +1300,9 @@ int up_putc(int ch) { #ifdef HAVE_SERIAL_CONSOLE struct up_dev_s *priv = (struct up_dev_s*)CONSOLE_DEV.priv; - uint8_t imr; + uint8_t ie; - up_disableuartint(priv, &imr); + up_disableuartint(priv, &ie); /* Check for LF */ @@ -1314,7 +1314,7 @@ int up_putc(int ch) } up_lowputc(ch); - up_restoreuartint(priv, imr); + up_restoreuartint(priv, ie); #endif return ch; } |