sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SAMV71-XULT: Some bugfixes from early bring-up work

Browse Source
This commit is contained in:
Gregory Nutt 2015-03-10 16:11:28 -06:00
parent 3e5d0f8c7e
commit b5980f024d
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm/src/samv7/sam_allocateheap.c
View File

@ -128,11 +128,17 @@
/* Check internal SRAM configuration */ /* Check internal SRAM configuration */
#if CONFIG_RAM_END > (SAM_DTCM_BASE+SAMV7_SRAM_SIZE) #ifdef CONFIG_ARMV7M_DTCM
# define SRAM_BASE SAM_DTCM_BASE
#else
# define SRAM_BASE SAM_SRAM_BASE
#endif
#if CONFIG_RAM_END > (SRAM_BASE+SAMV7_SRAM_SIZE)
# error "CONFIG_RAM_END is beyond the end of SRAM" # error "CONFIG_RAM_END is beyond the end of SRAM"
# undef CONFIG_RAM_END # undef CONFIG_RAM_END
# define CONFIG_RAM_END (SAM_DTCM_BASE+SAMV7_SRAM_SIZE) # define CONFIG_RAM_END (SRAM_BASE+SAMV7_SRAM_SIZE)
#elif CONFIG_RAM_END < (SAM_DTCM_BASE+SAMV7_SRAM_SIZE) #elif CONFIG_RAM_END < (SRAM_BASE+SAMV7_SRAM_SIZE)
# warning "CONFIG_RAM_END is before end of SRAM... not all of SRAM used" # warning "CONFIG_RAM_END is before end of SRAM... not all of SRAM used"
#endif #endif

20
arch/arm/src/samv7/sam_serial.c
View File

@ -177,13 +177,13 @@
#if defined(CONFIG_SAMV7_UART1) && !defined(UART1_ASSIGNED) #if defined(CONFIG_SAMV7_UART1) && !defined(UART1_ASSIGNED)
# define TTYS2_DEV g_uart1port /* UART1 is ttyS2 */ # define TTYS2_DEV g_uart1port /* UART1 is ttyS2 */
# define UART1_ASSIGNED 1 # define UART1_ASSIGNED 1
#elif defined(CONFIG_SAMV7_UART2) && !defined(UART1_ASSIGNED) #elif defined(CONFIG_SAMV7_UART2) && !defined(UART2_ASSIGNED)
# define TTYS2_DEV g_uart2port /* UART2 is ttyS2 */ # define TTYS2_DEV g_uart2port /* UART2 is ttyS2 */
# define UART2_ASSIGNED 1 # define UART2_ASSIGNED 1
#elif defined(CONFIG_SAMV7_UART3) && !defined(UART1_ASSIGNED) #elif defined(CONFIG_SAMV7_UART3) && !defined(UART3_ASSIGNED)
# define TTYS2_DEV g_uart3port /* UART3 is ttyS2 */ # define TTYS2_DEV g_uart3port /* UART3 is ttyS2 */
# define UART3_ASSIGNED 1 # define UART3_ASSIGNED 1
#elif defined(CONFIG_SAMV7_UART4) && !defined(UART1_ASSIGNED) #elif defined(CONFIG_SAMV7_UART4) && !defined(UART4_ASSIGNED)
# define TTYS2_DEV g_uart4port /* UART4 is ttyS2 */ # define TTYS2_DEV g_uart4port /* UART4 is ttyS2 */
# define UART4_ASSIGNED 1 # define UART4_ASSIGNED 1
#elif defined(CONFIG_SAMV7_USART0) && !defined(USART0_ASSIGNED) #elif defined(CONFIG_SAMV7_USART0) && !defined(USART0_ASSIGNED)
@ -202,13 +202,13 @@
* these could also be the console. * these could also be the console.
*/ */
#if defined(CONFIG_SAMV7_UART2) && !defined(UART1_ASSIGNED) #if defined(CONFIG_SAMV7_UART2) && !defined(UART2_ASSIGNED)
# define TTYS3_DEV g_uart2port /* UART2 is ttyS3 */ # define TTYS3_DEV g_uart2port /* UART2 is ttyS3 */
# define UART2_ASSIGNED 1 # define UART2_ASSIGNED 1
#elif defined(CONFIG_SAMV7_UART3) && !defined(UART1_ASSIGNED) #elif defined(CONFIG_SAMV7_UART3) && !defined(UART3_ASSIGNED)
# define TTYS3_DEV g_uart3port /* UART3 is ttyS3 */ # define TTYS3_DEV g_uart3port /* UART3 is ttyS3 */
# define UART3_ASSIGNED 1 # define UART3_ASSIGNED 1
#elif defined(CONFIG_SAMV7_UART4) && !defined(UART1_ASSIGNED) #elif defined(CONFIG_SAMV7_UART4) && !defined(UART4_ASSIGNED)
# define TTYS3_DEV g_uart4port /* UART4 is ttyS3 */ # define TTYS3_DEV g_uart4port /* UART4 is ttyS3 */
# define UART4_ASSIGNED 1 # define UART4_ASSIGNED 1
#elif defined(CONFIG_SAMV7_USART0) && !defined(USART0_ASSIGNED) #elif defined(CONFIG_SAMV7_USART0) && !defined(USART0_ASSIGNED)
@ -227,10 +227,10 @@
* these could also be the console. * these could also be the console.
*/ */
#if defined(CONFIG_SAMV7_UART3) && !defined(UART1_ASSIGNED) #if defined(CONFIG_SAMV7_UART3) && !defined(UART3_ASSIGNED)
# define TTYS4_DEV g_uart3port /* UART3 is ttyS4 */ # define TTYS4_DEV g_uart3port /* UART3 is ttyS4 */
# define UART3_ASSIGNED 1 # define UART3_ASSIGNED 1
#elif defined(CONFIG_SAMV7_UART4) && !defined(UART1_ASSIGNED) #elif defined(CONFIG_SAMV7_UART4) && !defined(UART4_ASSIGNED)
# define TTYS4_DEV g_uart4port /* UART4 is ttyS4 */ # define TTYS4_DEV g_uart4port /* UART4 is ttyS4 */
# define UART4_ASSIGNED 1 # define UART4_ASSIGNED 1
#elif defined(CONFIG_SAMV7_USART0) && !defined(USART0_ASSIGNED) #elif defined(CONFIG_SAMV7_USART0) && !defined(USART0_ASSIGNED)
@ -249,7 +249,7 @@
* of these could also be the console. * of these could also be the console.
*/ */
#if defined(CONFIG_SAMV7_UART4) && !defined(UART1_ASSIGNED) #if defined(CONFIG_SAMV7_UART4) && !defined(UART4_ASSIGNED)
# define TTYS5_DEV g_uart4port /* UART4 is ttyS5 */ # define TTYS5_DEV g_uart4port /* UART4 is ttyS5 */
# define UART4_ASSIGNED 1 # define UART4_ASSIGNED 1
#elif defined(CONFIG_SAMV7_USART0) && !defined(USART0_ASSIGNED) #elif defined(CONFIG_SAMV7_USART0) && !defined(USART0_ASSIGNED)
@ -1003,7 +1003,7 @@ static int sam_interrupt(struct uart_dev_s *dev)
int passes; int passes;
bool handled; bool handled;
DEBUGASSERT(dev && priv->priv); DEBUGASSERT(dev && dev->priv);
priv = (struct sam_dev_s*)dev->priv; priv = (struct sam_dev_s*)dev->priv;
/* Loop until there are no characters to be transferred or, until we have /* Loop until there are no characters to be transferred or, until we have