libpayload: Make Kconfig bools use IS_ENABLED()
This will make the code work with the different styles of Kconfig (emit unset bools vs don't emit unset bools) Roughly, the patch does this, and a little bit of fixing up: perl -pi -e 's,ifdef (CONFIG_LP_.+?)\b,if IS_ENABLED\($1\),g' `find . -name *.[ch]` perl -pi -e 's,ifndef (CONFIG_LP_.+?)\b,if !IS_ENABLED\($1\),g' `find . -name *.[ch]` Change-Id: Ib8a839b056a1f806a8597052e1b571ea3d18a79f Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Reviewed-on: http://review.coreboot.org/10711 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
|
||||
unsigned long pdc_key_modifiers = 0L;
|
||||
|
||||
#ifdef CONFIG_LP_SERIAL_CONSOLE
|
||||
#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE)
|
||||
/* We treat serial like a vt100 terminal. For now we
|
||||
do the cooking in here, but we should probably eventually
|
||||
pass it to dedicated vt100 code */
|
||||
@@ -108,7 +108,7 @@ void PDC_set_keyboard_binary(bool on)
|
||||
|
||||
bool PDC_check_key(void)
|
||||
{
|
||||
#ifdef CONFIG_LP_USB_HID
|
||||
#if IS_ENABLED(CONFIG_LP_USB_HID)
|
||||
usb_poll();
|
||||
if ((curses_flags & F_ENABLE_CONSOLE) &&
|
||||
usbhid_havechar()) {
|
||||
@@ -116,14 +116,14 @@ bool PDC_check_key(void)
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_LP_PC_KEYBOARD
|
||||
#if IS_ENABLED(CONFIG_LP_PC_KEYBOARD)
|
||||
if ((curses_flags & F_ENABLE_CONSOLE) &&
|
||||
keyboard_havechar()) {
|
||||
return TRUE;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_LP_SERIAL_CONSOLE
|
||||
#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE)
|
||||
if ((curses_flags & F_ENABLE_SERIAL) &&
|
||||
serial_havechar()) {
|
||||
return TRUE;
|
||||
@@ -139,7 +139,7 @@ int PDC_get_key(void)
|
||||
{
|
||||
int c = 0;
|
||||
|
||||
#ifdef CONFIG_LP_USB_HID
|
||||
#if IS_ENABLED(CONFIG_LP_USB_HID)
|
||||
usb_poll();
|
||||
if ((curses_flags & F_ENABLE_CONSOLE) &&
|
||||
usbhid_havechar()) {
|
||||
@@ -147,14 +147,14 @@ int PDC_get_key(void)
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_LP_PC_KEYBOARD
|
||||
#if IS_ENABLED(CONFIG_LP_PC_KEYBOARD)
|
||||
if ((curses_flags & F_ENABLE_CONSOLE) &&
|
||||
keyboard_havechar() && (c==0)) {
|
||||
c = keyboard_getchar();
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_LP_SERIAL_CONSOLE
|
||||
#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE)
|
||||
if ((curses_flags & F_ENABLE_SERIAL) &&
|
||||
serial_havechar() && (c==0)) {
|
||||
c = cook_serial(serial_getchar());
|
||||
|
Reference in New Issue
Block a user