From eab2a29c8bb0fafebd398cf60425dee37df27820 Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Tue, 5 Mar 2019 16:55:15 -0800 Subject: payloads: Replace all IS_ENABLED(CONFIG_XXX) with CONFIG(XXX) This patch is a raw application of find payloads/ -type f | \ xargs sed -i -e 's/IS_ENABLED\s*(CONFIG_/CONFIG(/g' Change-Id: I883b03b189f59b5d998a09a2596b0391a2d5cf33 Signed-off-by: Julius Werner Reviewed-on: https://review.coreboot.org/c/coreboot/+/31775 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- payloads/libpayload/curses/keyboard.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'payloads/libpayload/curses/keyboard.c') diff --git a/payloads/libpayload/curses/keyboard.c b/payloads/libpayload/curses/keyboard.c index f571d564ff..fe9dc34cb5 100644 --- a/payloads/libpayload/curses/keyboard.c +++ b/payloads/libpayload/curses/keyboard.c @@ -45,7 +45,7 @@ static int _halfdelay = 0; /* ============== Serial ==================== */ -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) +#if 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 */ @@ -146,13 +146,13 @@ static int cook_serial(unsigned char ch) static int curses_getchar(int _delay) { -#if IS_ENABLED(CONFIG_LP_USB_HID) || IS_ENABLED(CONFIG_LP_PC_KEYBOARD) || \ - IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) +#if CONFIG(LP_USB_HID) || CONFIG(LP_PC_KEYBOARD) || \ + CONFIG(LP_SERIAL_CONSOLE) unsigned short c; #endif do { -#if IS_ENABLED(CONFIG_LP_USB_HID) +#if CONFIG(LP_USB_HID) usb_poll(); if ((curses_flags & F_ENABLE_CONSOLE) && usbhid_havechar()) { @@ -160,7 +160,7 @@ static int curses_getchar(int _delay) if (c != 0) return c; } #endif -#if IS_ENABLED(CONFIG_LP_PC_KEYBOARD) +#if CONFIG(LP_PC_KEYBOARD) if ((curses_flags & F_ENABLE_CONSOLE) && keyboard_havechar()) { c = keyboard_getchar(); @@ -168,7 +168,7 @@ static int curses_getchar(int _delay) } #endif -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) +#if CONFIG(LP_SERIAL_CONSOLE) if ((curses_flags & F_ENABLE_SERIAL) && serial_havechar()) { c = serial_getchar(); @@ -226,7 +226,7 @@ int nocbreak(void) return 0; } -#if IS_ENABLED(CONFIG_LP_VGA_VIDEO_CONSOLE) +#if CONFIG(LP_VGA_VIDEO_CONSOLE) void curses_enable_vga(int state) { if (state) @@ -244,7 +244,7 @@ void curses_enable_vga(int state) { } int curses_vga_enabled(void) { return 0; } #endif -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) +#if CONFIG(LP_SERIAL_CONSOLE) void curses_enable_serial(int state) { if (state) -- cgit v1.2.3