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

drivers/lcd/Kconfig and several other places: Rename CONFIG_LCD_CONSOLE to CONFIG_SLCD_CONSOLE. The original name CONFIG_LCD_CONSOLE is incorrect because it runs on SLCD display. This patch fix it and update its dependences

Browse Source
This commit is contained in:
Alan Carvalho de Assis 2018-11-30 17:36:13 -06:00 committed by Gregory Nutt
parent 05b6a19a81
commit 3a2a423214
7 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/renesas/src/common/up_internal.h
View File

@ -191,7 +191,7 @@ void renesas_timer_initialize(void);
/* Defined in board/xyz_lcd.c */ /* Defined in board/xyz_lcd.c */
#ifdef CONFIG_LCD_CONSOLE #ifdef CONFIG_SLCD_CONSOLE
void up_lcdinit(void); void up_lcdinit(void);
void up_lcdputc(char ch); void up_lcdputc(char ch);
#else #else

8
arch/renesas/src/m16c/m16c_lowputc.c
View File

@ -90,9 +90,9 @@
# undef HAVE_SERIALCONSOLE # undef HAVE_SERIALCONSOLE
#endif #endif
#if defined(HAVE_SERIALCONSOLE) && defined(CONFIG_LCD_CONSOLE) #if defined(HAVE_SERIALCONSOLE) && defined(CONFIG_SLCD_CONSOLE)
# error "Both serial and LCD consoles are defined" # error "Both serial and LCD consoles are defined"
#elif !defined(HAVE_SERIALCONSOLE) && !defined(CONFIG_LCD_CONSOLE) #elif !defined(HAVE_SERIALCONSOLE) && !defined(CONFIG_SLCD_CONSOLE)
# warning "No console is defined" # warning "No console is defined"
#endif #endif
@ -298,7 +298,7 @@ static inline void up_lowserialsetup(void)
* *
****************************************************************************/ ****************************************************************************/
#if defined(HAVE_SERIAL) && !defined(CONFIG_LCD_CONSOLE) #if defined(HAVE_SERIAL) && !defined(CONFIG_SLCD_CONSOLE)
void up_lowputc(char ch) void up_lowputc(char ch)
{ {
#ifdef HAVE_SERIALCONSOLE #ifdef HAVE_SERIALCONSOLE
@ -335,7 +335,7 @@ void up_lowsetup(void)
/* The LCD is initialized here if the LCD is used for console output. */ /* The LCD is initialized here if the LCD is used for console output. */
#ifdef CONFIG_LCD_CONSOLE #ifdef CONFIG_SLCD_CONSOLE
up_lcdinit(); up_lcdinit();
#endif #endif
} }

4
arch/renesas/src/m16c/m16c_serial.c
View File

@ -130,9 +130,9 @@
# undef CONFIG_UART2_SERIAL_CONSOLE # undef CONFIG_UART2_SERIAL_CONSOLE
#endif #endif
#if defined(HAVE_SERIALCONSOLE) && defined(CONFIG_LCD_CONSOLE) #if defined(HAVE_SERIALCONSOLE) && defined(CONFIG_SLCD_CONSOLE)
# error "Both serial and LCD consoles are defined" # error "Both serial and LCD consoles are defined"
#elif !defined(HAVE_SERIALCONSOLE) && !defined(CONFIG_LCD_CONSOLE) #elif !defined(HAVE_SERIALCONSOLE) && !defined(CONFIG_SLCD_CONSOLE)
# warning "No console is defined" # warning "No console is defined"
#endif #endif

4
configs/skp16c26/ostest/defconfig
View File

@ -15,8 +15,6 @@ CONFIG_DISABLE_POLL=y
CONFIG_ENDIAN_BIG=y CONFIG_ENDIAN_BIG=y
CONFIG_EXAMPLES_OSTEST=y CONFIG_EXAMPLES_OSTEST=y
CONFIG_IDLETHREAD_STACKSIZE=256 CONFIG_IDLETHREAD_STACKSIZE=256
CONFIG_LCD_CONSOLE=y
CONFIG_LCD=y
CONFIG_MAX_TASKS=8 CONFIG_MAX_TASKS=8
CONFIG_MAX_WDOGPARMS=2 CONFIG_MAX_WDOGPARMS=2
CONFIG_MOTOROLA_SREC=y CONFIG_MOTOROLA_SREC=y
@ -32,6 +30,8 @@ CONFIG_RAM_SIZE=2048
CONFIG_RAM_START=0x00400 CONFIG_RAM_START=0x00400
CONFIG_RR_INTERVAL=200 CONFIG_RR_INTERVAL=200
CONFIG_SDCLONE_DISABLE=y CONFIG_SDCLONE_DISABLE=y
CONFIG_SLCD=y
CONFIG_SLCD_CONSOLE=y
CONFIG_START_DAY=20 CONFIG_START_DAY=20
CONFIG_START_MONTH=2 CONFIG_START_MONTH=2
CONFIG_START_YEAR=2009 CONFIG_START_YEAR=2009

4
configs/skp16c26/src/m16c_lcd.c
View File

@ -47,7 +47,7 @@
#include "up_internal.h" #include "up_internal.h"
#include "chip.h" #include "chip.h"
#ifdef CONFIG_LCD #ifdef CONFIG_SLCD
/************************************************************************************ /************************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
@ -280,4 +280,4 @@ void up_lcdputc(char ch)
} }
} }
#endif /* CONFIG_LCD */ #endif /* CONFIG_SLCD */

5
configs/skp16c26/src/m16c_lcdconsole.c
View File

@ -56,7 +56,8 @@
# undef HAVE_SERIALCONSOLE # undef HAVE_SERIALCONSOLE
#endif #endif
#if !defined(HAVE_SERIALCONSOLE) && defined(CONFIG_LCD) && defined(CONFIG_LCD_CONSOLE) #if !defined(HAVE_SERIALCONSOLE) && defined(CONFIG_SLCD) && \
defined(CONFIG_SLCD_CONSOLE)
/************************************************************************************ /************************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
@ -138,4 +139,4 @@ int up_putc(int ch)
return ch; return ch;
} }
#endif /* !HAVE_SERIALCONSOLE && CONFIG_LCD && CONFIG_LCD_CONSOLE */ #endif /* !HAVE_SERIALCONSOLE && CONFIG_SLCD && CONFIG_SLCD_CONSOLE */

22
drivers/lcd/Kconfig
View File

@ -58,17 +58,6 @@ config LCD_EXTERNINIT
menu "LCD driver selection" menu "LCD driver selection"
config LCD_CONSOLE
bool "LCD console output"
default n
---help---
It is possible to use an SLCD to provide console output. This option
enables that possibility.
At present, only one architecture supports this option (M16C).
However, this feature could be provided by other architectures in
the future.
config LCD_NOGETRUN config LCD_NOGETRUN
bool "Write-only LCD" bool "Write-only LCD"
default n default n
@ -1172,6 +1161,17 @@ menuconfig SLCD
if SLCD if SLCD
config SLCD_CONSOLE
bool "SLCD console output"
default n
---help---
It is possible to use an SLCD to provide console output. This option
enables that possibility.
At present, only one architecture supports this option (M16C).
However, this feature could be provided by other architectures in
the future.
config LCD_LCD1602 config LCD_LCD1602
bool "LCD 1602" bool "LCD 1602"
default n default n