Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 08:22:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/armv7-m/up_svcall.c
+1
View File
@@ -46,6 +46,7 @@
#include <arch/irq.h> #include <arch/irq.h>
#include <nuttx/sched.h> #include <nuttx/sched.h>
#include <nuttx/userspace.h>
#ifdef CONFIG_LIB_SYSCALL #ifdef CONFIG_LIB_SYSCALL
# include <syscall.h> # include <syscall.h>
arch/arm/src/common/up_pthread_start.c
+2 -3
View File
@@ -44,9 +44,8 @@
#include "svcall.h" #include "svcall.h"
#include "up_internal.h" #include "up_internal.h"
#if ((defined(CONFIG_BUILD_PROTECTED) && defined(__KERNEL__) || \ #if ((defined(CONFIG_BUILD_PROTECTED) && defined(__KERNEL__)) || \
defined(defined(CONFIG_BUILD_KERNEL)) && \ defined(CONFIG_BUILD_KERNEL)) && !defined(CONFIG_DISABLE_PTHREAD)
!defined(CONFIG_DISABLE_PTHREAD)
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
arch/arm/src/common/up_signal_dispatch.c
+2 -3
View File
@@ -43,9 +43,8 @@
#include "svcall.h" #include "svcall.h"
#include "up_internal.h" #include "up_internal.h"
#if ((defined(CONFIG_BUILD_PROTECTED) && defined(__KERNEL__) || \ #if ((defined(CONFIG_BUILD_PROTECTED) && defined(__KERNEL__)) || \
defined(defined(CONFIG_BUILD_KERNEL)) && \ defined(CONFIG_BUILD_KERNEL)) && !defined(CONFIG_DISABLE_SIGNALS)
!defined(CONFIG_DISABLE_SIGNALS)
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
arch/arm/src/stm32/stm32_serial.c
+4 -5
View File
@@ -177,7 +177,7 @@
/* The DMA buffer size when using RX DMA to emulate a FIFO. /* The DMA buffer size when using RX DMA to emulate a FIFO.
* *
* When streaming data, the generic serial layer will be called * 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 # define RXDMA_BUFFER_SIZE 32
@@ -2426,8 +2426,6 @@ static void up_dma_rxcallback(DMA_HANDLE handle, uint8_t status, void *arg)
} }
#endif #endif
#endif /* HAVE UART */
/**************************************************************************** /****************************************************************************
* Name: up_pm_notify * 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; return OK;
} }
#endif #endif
#endif /* USE_SERIALDRIVER */
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/
#ifdef USE_SERIALDRIVER
/**************************************************************************** /****************************************************************************
* Name: up_earlyserialinit * Name: up_earlyserialinit
* *
@@ -2734,8 +2735,6 @@ void stm32_serial_dma_poll(void)
* *
****************************************************************************/ ****************************************************************************/
#ifdef USE_SERIALDRIVER
int up_putc(int ch) int up_putc(int ch)
{ {
#if CONSOLE_UART > 0 #if CONSOLE_UART > 0