diff options
author | Julius Werner <jwerner@chromium.org> | 2019-03-05 16:55:15 -0800 |
---|---|---|
committer | Patrick Georgi <pgeorgi@google.com> | 2019-03-07 17:15:30 +0000 |
commit | eab2a29c8bb0fafebd398cf60425dee37df27820 (patch) | |
tree | 419dab747e0148442c1a7ac7082fcfe37784ea27 /payloads/libpayload/curses | |
parent | b431833c129e0d6402c6f7be8e6028e4b54e94fb (diff) | |
download | coreboot-eab2a29c8bb0fafebd398cf60425dee37df27820.tar.gz coreboot-eab2a29c8bb0fafebd398cf60425dee37df27820.tar.bz2 coreboot-eab2a29c8bb0fafebd398cf60425dee37df27820.zip |
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 <jwerner@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/31775
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'payloads/libpayload/curses')
-rw-r--r-- | payloads/libpayload/curses/keyboard.c | 16 | ||||
-rw-r--r-- | payloads/libpayload/curses/local.h | 4 | ||||
-rw-r--r-- | payloads/libpayload/curses/pdcurses-backend/pdcdisp.c | 16 | ||||
-rw-r--r-- | payloads/libpayload/curses/pdcurses-backend/pdckbd.c | 14 | ||||
-rw-r--r-- | payloads/libpayload/curses/pdcurses-backend/pdcscrn.c | 2 | ||||
-rw-r--r-- | payloads/libpayload/curses/pdcurses-backend/pdcsetsc.c | 4 | ||||
-rw-r--r-- | payloads/libpayload/curses/pdcurses-backend/pdcutil.c | 2 | ||||
-rw-r--r-- | payloads/libpayload/curses/tinycurses.c | 30 |
8 files changed, 44 insertions, 44 deletions
diff --git a/payloads/libpayload/curses/keyboard.c b/payloads/libpayload/curses/keyboard.c index f571d564ff29..fe9dc34cb505 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) diff --git a/payloads/libpayload/curses/local.h b/payloads/libpayload/curses/local.h index 660f5db581f8..274c389cb28b 100644 --- a/payloads/libpayload/curses/local.h +++ b/payloads/libpayload/curses/local.h @@ -70,13 +70,13 @@ /* Flags used to determine what output methods are available */ -#if IS_ENABLED(CONFIG_LP_VIDEO_CONSOLE) +#if CONFIG(LP_VIDEO_CONSOLE) #define F_ENABLE_CONSOLE 0x01 #else #define F_ENABLE_CONSOLE 0x00 #endif -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) +#if CONFIG(LP_SERIAL_CONSOLE) #define F_ENABLE_SERIAL 0x02 #else #define F_ENABLE_SERIAL 0x00 diff --git a/payloads/libpayload/curses/pdcurses-backend/pdcdisp.c b/payloads/libpayload/curses/pdcurses-backend/pdcdisp.c index af1b50a3ebd5..234d62a84b6a 100644 --- a/payloads/libpayload/curses/pdcurses-backend/pdcdisp.c +++ b/payloads/libpayload/curses/pdcurses-backend/pdcdisp.c @@ -66,8 +66,8 @@ chtype fallback_acs_map[128] = '|', '<', '>', '*', '!', 'f', 'o', ' ', }; -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) -#if IS_ENABLED(CONFIG_LP_SERIAL_ACS_FALLBACK) +#if CONFIG(LP_SERIAL_CONSOLE) +#if CONFIG(LP_SERIAL_ACS_FALLBACK) chtype serial_acs_map[128]; #else /* See acsc of vt100. */ @@ -93,7 +93,7 @@ chtype serial_acs_map[128] = #endif #endif -#if IS_ENABLED(CONFIG_LP_VIDEO_CONSOLE) +#if CONFIG(LP_VIDEO_CONSOLE) /* See acsc of linux. */ chtype console_acs_map[128] = { @@ -122,10 +122,10 @@ void PDC_gotoyx(int row, int col) { PDC_LOG(("PDC_gotoyx() - called: row %d col %d\n", row, col)); -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) +#if CONFIG(LP_SERIAL_CONSOLE) serial_set_cursor(col, row); #endif -#if IS_ENABLED(CONFIG_LP_VIDEO_CONSOLE) +#if CONFIG(LP_VIDEO_CONSOLE) video_console_set_cursor(col, row); #endif } @@ -139,7 +139,7 @@ void PDC_transform_line(int lineno, int x, int len, const chtype *srcp) PDC_LOG(("PDC_transform_line() - called: line %d, len %d, curses_flags %d\n", lineno, len, curses_flags)); -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) +#if CONFIG(LP_SERIAL_CONSOLE) int serial_is_bold = 0; int serial_is_reverse = 0; int serial_is_altcharset = 0; @@ -157,7 +157,7 @@ void PDC_transform_line(int lineno, int x, int len, const chtype *srcp) { ch = srcp[j]; attr = ch; -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) +#if CONFIG(LP_SERIAL_CONSOLE) if (curses_flags & F_ENABLE_SERIAL) { if (attr & A_BOLD) { if (!serial_is_bold) { @@ -222,7 +222,7 @@ void PDC_transform_line(int lineno, int x, int len, const chtype *srcp) } #endif -#if IS_ENABLED(CONFIG_LP_VIDEO_CONSOLE) +#if CONFIG(LP_VIDEO_CONSOLE) unsigned char c = pdc_atrtab[srcp[j] >> PDC_ATTR_SHIFT]; if (curses_flags & F_ENABLE_CONSOLE) { diff --git a/payloads/libpayload/curses/pdcurses-backend/pdckbd.c b/payloads/libpayload/curses/pdcurses-backend/pdckbd.c index 6b5b7eade1d5..2d8a55b4ca59 100644 --- a/payloads/libpayload/curses/pdcurses-backend/pdckbd.c +++ b/payloads/libpayload/curses/pdcurses-backend/pdckbd.c @@ -5,7 +5,7 @@ unsigned long pdc_key_modifiers = 0L; -#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 */ @@ -108,7 +108,7 @@ void PDC_set_keyboard_binary(bool on) bool PDC_check_key(void) { -#if IS_ENABLED(CONFIG_LP_USB_HID) +#if CONFIG(LP_USB_HID) usb_poll(); if ((curses_flags & F_ENABLE_CONSOLE) && usbhid_havechar()) { @@ -116,14 +116,14 @@ bool PDC_check_key(void) } #endif -#if IS_ENABLED(CONFIG_LP_PC_KEYBOARD) +#if CONFIG(LP_PC_KEYBOARD) if ((curses_flags & F_ENABLE_CONSOLE) && keyboard_havechar()) { return TRUE; } #endif -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) +#if 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; -#if IS_ENABLED(CONFIG_LP_USB_HID) +#if CONFIG(LP_USB_HID) usb_poll(); if ((curses_flags & F_ENABLE_CONSOLE) && usbhid_havechar()) { @@ -147,14 +147,14 @@ int PDC_get_key(void) } #endif -#if IS_ENABLED(CONFIG_LP_PC_KEYBOARD) +#if CONFIG(LP_PC_KEYBOARD) if ((curses_flags & F_ENABLE_CONSOLE) && keyboard_havechar() && (c == 0)) { c = keyboard_getchar(); } #endif -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) +#if CONFIG(LP_SERIAL_CONSOLE) if ((curses_flags & F_ENABLE_SERIAL) && serial_havechar() && (c == 0)) { c = cook_serial(serial_getchar()); diff --git a/payloads/libpayload/curses/pdcurses-backend/pdcscrn.c b/payloads/libpayload/curses/pdcurses-backend/pdcscrn.c index e33edc21674d..6286b7f60073 100644 --- a/payloads/libpayload/curses/pdcurses-backend/pdcscrn.c +++ b/payloads/libpayload/curses/pdcurses-backend/pdcscrn.c @@ -72,7 +72,7 @@ int PDC_scr_open(int argc, char **argv) SP->lines = PDC_get_rows(); SP->cols = PDC_get_columns(); -#if IS_ENABLED(CONFIG_LP_SPEAKER) +#if CONFIG(LP_SPEAKER) SP->audible = TRUE; #endif diff --git a/payloads/libpayload/curses/pdcurses-backend/pdcsetsc.c b/payloads/libpayload/curses/pdcurses-backend/pdcsetsc.c index ba230c654bb7..adcf06926a6d 100644 --- a/payloads/libpayload/curses/pdcurses-backend/pdcsetsc.c +++ b/payloads/libpayload/curses/pdcurses-backend/pdcsetsc.c @@ -13,12 +13,12 @@ int PDC_curs_set(int visibility) ret_vis = SP->visibility; SP->visibility = visibility; -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) +#if CONFIG(LP_SERIAL_CONSOLE) if (curses_flags & F_ENABLE_SERIAL) { serial_cursor_enable(visibility); } #endif -#if IS_ENABLED(CONFIG_LP_VIDEO_CONSOLE) +#if CONFIG(LP_VIDEO_CONSOLE) if (curses_flags & F_ENABLE_CONSOLE) { video_console_cursor_enable(visibility); } diff --git a/payloads/libpayload/curses/pdcurses-backend/pdcutil.c b/payloads/libpayload/curses/pdcurses-backend/pdcutil.c index d423f0cf2983..f3f131f073d5 100644 --- a/payloads/libpayload/curses/pdcurses-backend/pdcutil.c +++ b/payloads/libpayload/curses/pdcurses-backend/pdcutil.c @@ -11,7 +11,7 @@ void PDC_beep(void) { PDC_LOG(("PDC_beep() - called\n")); -#if IS_ENABLED(CONFIG_LP_SPEAKER) +#if CONFIG(LP_SPEAKER) speaker_tone(1760, 500); /* 1760 == note A6 */ #endif } diff --git a/payloads/libpayload/curses/tinycurses.c b/payloads/libpayload/curses/tinycurses.c index 789accb475b2..c50f10bbcc06 100644 --- a/payloads/libpayload/curses/tinycurses.c +++ b/payloads/libpayload/curses/tinycurses.c @@ -111,8 +111,8 @@ chtype fallback_acs_map[128] = '|', '<', '>', '*', '!', 'f', 'o', ' ', }; -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) -#if IS_ENABLED(CONFIG_LP_SERIAL_ACS_FALLBACK) +#if CONFIG(LP_SERIAL_CONSOLE) +#if CONFIG(LP_SERIAL_ACS_FALLBACK) chtype serial_acs_map[128]; #else /* See acsc of vt100. */ @@ -138,7 +138,7 @@ chtype serial_acs_map[128] = #endif #endif -#if IS_ENABLED(CONFIG_LP_VIDEO_CONSOLE) +#if CONFIG(LP_VIDEO_CONSOLE) /* See acsc of linux. */ chtype console_acs_map[128] = { @@ -191,7 +191,7 @@ NCURSES_CH_T _nc_render(WINDOW *win, NCURSES_CH_T ch) int beep(void) { /* TODO: Flash the screen if beeping fails? */ -#if IS_ENABLED(CONFIG_LP_SPEAKER) +#if CONFIG(LP_SPEAKER) speaker_tone(1760, 500); /* 1760 == note A6 */ #endif return OK; @@ -202,12 +202,12 @@ int cbreak(void) { /* TODO */ return 0; } // int color_content(short color, short *r, short *g, short *b) {} int curs_set(int on) { -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) +#if CONFIG(LP_SERIAL_CONSOLE) if (curses_flags & F_ENABLE_SERIAL) { serial_cursor_enable(on); } #endif -#if IS_ENABLED(CONFIG_LP_VIDEO_CONSOLE) +#if CONFIG(LP_VIDEO_CONSOLE) if (curses_flags & F_ENABLE_CONSOLE) { video_console_cursor_enable(on); } @@ -315,12 +315,12 @@ WINDOW *initscr(void) for (i = 0; i < 128; i++) acs_map[i] = (chtype) i | A_ALTCHARSET; -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) +#if CONFIG(LP_SERIAL_CONSOLE) if (curses_flags & F_ENABLE_SERIAL) { serial_clear(); } #endif -#if IS_ENABLED(CONFIG_LP_VIDEO_CONSOLE) +#if CONFIG(LP_VIDEO_CONSOLE) if (curses_flags & F_ENABLE_CONSOLE) { /* Clear the screen and kill the cursor */ @@ -724,7 +724,7 @@ int whline(WINDOW *win, chtype ch, int n) (((c) & 0x4400) >> 2) | ((c) & 0xAA00) | (((c) & 0x1100) << 2) int wnoutrefresh(WINDOW *win) { -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) +#if CONFIG(LP_SERIAL_CONSOLE) // FIXME. int serial_is_bold = 0; int serial_is_reverse = 0; @@ -737,7 +737,7 @@ int wnoutrefresh(WINDOW *win) int x, y; chtype ch; -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) +#if CONFIG(LP_SERIAL_CONSOLE) serial_end_bold(); serial_end_altcharset(); #endif @@ -749,7 +749,7 @@ int wnoutrefresh(WINDOW *win) /* Position the serial cursor */ -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) +#if CONFIG(LP_SERIAL_CONSOLE) if (curses_flags & F_ENABLE_SERIAL) serial_set_cursor(win->_begy + y, win->_begx + win->_line[y].firstchar); @@ -758,7 +758,7 @@ int wnoutrefresh(WINDOW *win) for (x = win->_line[y].firstchar; x <= win->_line[y].lastchar; x++) { attr_t attr = win->_line[y].text[x].attr; -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) +#if CONFIG(LP_SERIAL_CONSOLE) if (curses_flags & F_ENABLE_SERIAL) { ch = win->_line[y].text[x].chars[0]; @@ -824,7 +824,7 @@ int wnoutrefresh(WINDOW *win) } #endif -#if IS_ENABLED(CONFIG_LP_VIDEO_CONSOLE) +#if CONFIG(LP_VIDEO_CONSOLE) unsigned int c = ((int)color_pairs[PAIR_NUMBER(attr)]) << 8; @@ -865,12 +865,12 @@ int wnoutrefresh(WINDOW *win) win->_line[y].lastchar = _NOCHANGE; } -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) +#if CONFIG(LP_SERIAL_CONSOLE) if (curses_flags & F_ENABLE_SERIAL) serial_set_cursor(win->_begy + win->_cury, win->_begx + win->_curx); #endif -#if IS_ENABLED(CONFIG_LP_VIDEO_CONSOLE) +#if CONFIG(LP_VIDEO_CONSOLE) if (curses_flags & F_ENABLE_CONSOLE) video_console_set_cursor(win->_begx + win->_curx, win->_begy + win->_cury); #endif |