OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

A10: Handle UART BUSY interrupt; Back out change to mkconfig.c -- it causes problems for assembly

This commit is contained in:
Gregory Nutt 2013-12-07 11:46:08 -06:00
parent 72f00b9bb6
commit 9d393e167c
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -6374,3 +6374,8 @@
missing interrupt handling logic for UART4-7 (2014-1-6). missing interrupt handling logic for UART4-7 (2014-1-6).
* nuttx/tools/mkconfig.c: Cast size to unsigned in calculation of * nuttx/tools/mkconfig.c: Cast size to unsigned in calculation of
CONFIG_RAM_END to avoid complains about integer overflow (2013-1-6). CONFIG_RAM_END to avoid complains about integer overflow (2013-1-6).
* nuttx/tools/mkconfig.c: Back out the last change, this causes
problems for assembly language. How to prevent the integer over-
flow warnings? (2014-1-6).
* arch/arm/src/a1x/a1x_serial.c: Handle BUSY interrupt (2014-1-6).

7
arch/arm/src/a1x/a1x_serial.c
View File

@ -1173,12 +1173,17 @@ static int uart_interrupt(struct uart_dev_s *dev)
break; break;
} }
/* Busy detect. Just ignore. Cleared by reading the status register */
case UART_IIR_IID_BUSY:
break;
/* Otherwise, there is no (handled) interrupt pending */ /* Otherwise, there is no (handled) interrupt pending */
case UART_IIR_IID_NONE: case UART_IIR_IID_NONE:
default: default:
{ {
dbg("Unexpected IIR: %02x\n", status); lldbg("Unexpected IIR: %02x\n", status);
break; break;
} }
} }

2
tools/mkconfig.c
View File

@ -182,7 +182,7 @@ int main(int argc, char **argv, char **envp)
printf(" * of RAM plus the RAM size.\n"); printf(" * of RAM plus the RAM size.\n");
printf(" */\n\n"); printf(" */\n\n");
printf("#ifndef CONFIG_RAM_END\n"); printf("#ifndef CONFIG_RAM_END\n");
printf("# define CONFIG_RAM_END (CONFIG_RAM_START+(unsigned)CONFIG_RAM_SIZE)\n"); printf("# define CONFIG_RAM_END (CONFIG_RAM_START+CONFIG_RAM_SIZE)\n");
printf("#endif\n\n"); printf("#endif\n\n");
printf("#ifndef CONFIG_RAM_VEND\n"); printf("#ifndef CONFIG_RAM_VEND\n");
printf("# define CONFIG_RAM_VEND (CONFIG_RAM_VSTART+CONFIG_RAM_SIZE)\n"); printf("# define CONFIG_RAM_VEND (CONFIG_RAM_VSTART+CONFIG_RAM_SIZE)\n");