Various changes/fixes to get configs/stm32f4discovery/kostest working after the big configuration renaming (and after a long period of bit rot)

This commit is contained in:
Gregory Nutt
2014-08-29 16:23:46 -06:00
parent 5fb235c615
commit 729bc9f9a7
4 changed files with 9 additions and 11 deletions
+1
View File
@@ -46,6 +46,7 @@
#include <arch/irq.h>
#include <nuttx/sched.h>
#include <nuttx/userspace.h>
#ifdef CONFIG_LIB_SYSCALL
# include <syscall.h>
+2 -3
View File
@@ -44,9 +44,8 @@
#include "svcall.h"
#include "up_internal.h"
#if ((defined(CONFIG_BUILD_PROTECTED) && defined(__KERNEL__) || \
defined(defined(CONFIG_BUILD_KERNEL)) && \
!defined(CONFIG_DISABLE_PTHREAD)
#if ((defined(CONFIG_BUILD_PROTECTED) && defined(__KERNEL__)) || \
defined(CONFIG_BUILD_KERNEL)) && !defined(CONFIG_DISABLE_PTHREAD)
/****************************************************************************
* Pre-processor Definitions
+2 -3
View File
@@ -43,9 +43,8 @@
#include "svcall.h"
#include "up_internal.h"
#if ((defined(CONFIG_BUILD_PROTECTED) && defined(__KERNEL__) || \
defined(defined(CONFIG_BUILD_KERNEL)) && \
!defined(CONFIG_DISABLE_SIGNALS)
#if ((defined(CONFIG_BUILD_PROTECTED) && defined(__KERNEL__)) || \
defined(CONFIG_BUILD_KERNEL)) && !defined(CONFIG_DISABLE_SIGNALS)
/****************************************************************************
* Pre-processor Definitions
+4 -5
View File
@@ -177,7 +177,7 @@
/* The DMA buffer size when using RX DMA to emulate a FIFO.
*
* When streaming data, the generic serial layer will be called
* everytime the FIFO receives half this number of bytes.
* every time the FIFO receives half this number of bytes.
*/
# define RXDMA_BUFFER_SIZE 32
@@ -2426,8 +2426,6 @@ static void up_dma_rxcallback(DMA_HANDLE handle, uint8_t status, void *arg)
}
#endif
#endif /* HAVE UART */
/****************************************************************************
* Name: up_pm_notify
*
@@ -2532,11 +2530,14 @@ static int up_pm_prepare(struct pm_callback_s *cb, enum pm_state_e pmstate)
return OK;
}
#endif
#endif /* USE_SERIALDRIVER */
/****************************************************************************
* Public Functions
****************************************************************************/
#ifdef USE_SERIALDRIVER
/****************************************************************************
* Name: up_earlyserialinit
*
@@ -2734,8 +2735,6 @@ void stm32_serial_dma_poll(void)
*
****************************************************************************/
#ifdef USE_SERIALDRIVER
int up_putc(int ch)
{
#if CONSOLE_UART > 0