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

Fix some backward conditional compilation

Browse Source
This commit is contained in:
Gregory Nutt 2017-02-25 18:32:58 -06:00
parent abfb070ee1
commit 2238912507
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/src/kinetis/kinetis_config.h
View File

@ -84,7 +84,7 @@
# undef CONFIG_KINETIS_LPUART0 # undef CONFIG_KINETIS_LPUART0
#endif #endif
/* Are any UARTs enabled? */ /* Are any UARTs or LPUARTs enabled? */
#undef HAVE_UART_DEVICE #undef HAVE_UART_DEVICE
#if defined(CONFIG_KINETIS_UART0) || defined(CONFIG_KINETIS_UART1) || \ #if defined(CONFIG_KINETIS_UART0) || defined(CONFIG_KINETIS_UART1) || \

4
arch/arm/src/kinetis/kinetis_serial.c
View File

@ -1315,7 +1315,7 @@ void up_serialinit(void)
* *
****************************************************************************/ ****************************************************************************/
#ifndef HAVE_UART_PUTC #ifdef HAVE_UART_PUTC
int up_putc(int ch) int up_putc(int ch)
{ {
#ifdef HAVE_UART_CONSOLE #ifdef HAVE_UART_CONSOLE
@ -1350,7 +1350,7 @@ int up_putc(int ch)
* *
****************************************************************************/ ****************************************************************************/
#ifndef HAVE_UART_PUTC #ifdef HAVE_UART_PUTC
int up_putc(int ch) int up_putc(int ch)
{ {
#ifdef HAVE_UART_CONSOLE #ifdef HAVE_UART_CONSOLE

12
include/nuttx/wireless/cc3000.h
View File

@ -56,14 +56,14 @@
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
#define DEV_FORMAT "/dev/wireless%d" /* The device Name*/ #define DEV_FORMAT "/dev/wireless%d" /* The device Name*/
#define DEV_NAMELEN 17 /* The buffer size to hold formatted string*/ #define DEV_NAMELEN 17 /* The buffer size to hold formatted string*/
#define QUEUE_FORMAT "wlq%d" /* The Queue name */ #define QUEUE_FORMAT "wlq%d" /* The Queue name */
#define QUEUE_NAMELEN 8 /* The buffer size to hold formatted string*/ #define QUEUE_NAMELEN 8 /* The buffer size to hold formatted string*/
#define SEM_FORMAT "wls%d" /* The Spi Resume Senaphore name*/ #define SEM_FORMAT "wls%d" /* The Spi Resume Senaphore name*/
#define SEM_NAMELEN 8 /* The buffer size to hold formatted string*/ #define SEM_NAMELEN 8 /* The buffer size to hold formatted string*/
/* IOCTL commands */ /* IOCTL commands */