diff options
| author | Gabe Black <gabeblack@google.com> | 2013-08-09 04:27:35 -0700 |
|---|---|---|
| committer | Isaac Christensen <isaac.christensen@se-eng.com> | 2014-08-05 18:44:08 +0200 |
| commit | 1ee2c6dbdfe7e35ab5e25a6136eab824ed2fec8f (patch) | |
| tree | fabae429ff872caed315281a0c243fa0bd753565 /payloads/libpayload/curses/keyboard.c | |
| parent | b77431336e44ba9721f18220e2a7dedafe250528 (diff) | |
libpayload: Change CONFIG_* to CONFIG_LP_* in the kconfig.
When libpayload header files are included in the payload itself, it's possible
that the payloads config settings will conflict with the ones in libpayload.
It's also possible for the libpayload config settings to conflict with the
payloads. To avoid that, the libpayload config settings have _LP_ (for
libpayload) added to them. The symbols themselves as defined in the Config.in files
are still the same, but the prefix added to them is now CONFIG_LP_ instead of just
CONFIG_.
Change-Id: Ib8a46d202e7880afdeac7924d69a949bfbcc5f97
Signed-off-by: Gabe Black <gabeblack@google.com>
Reviewed-on: https://gerrit.chromium.org/gerrit/65303
Reviewed-by: Stefan Reinauer <reinauer@google.com>
Tested-by: Gabe Black <gabeblack@chromium.org>
Commit-Queue: Gabe Black <gabeblack@chromium.org>
(cherry picked from commit 23e866da20862cace0ed2a67d6fb74056bc9ea9a)
Signed-off-by: Isaac Christensen <isaac.christensen@se-eng.com>
Reviewed-on: http://review.coreboot.org/6427
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Marc Jones <marc.jones@se-eng.com>
Diffstat (limited to 'payloads/libpayload/curses/keyboard.c')
| -rw-r--r-- | payloads/libpayload/curses/keyboard.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/payloads/libpayload/curses/keyboard.c b/payloads/libpayload/curses/keyboard.c index 9648dde573..927e06f17f 100644 --- a/payloads/libpayload/curses/keyboard.c +++ b/payloads/libpayload/curses/keyboard.c @@ -45,7 +45,7 @@ static int _halfdelay = 0; /* ============== Serial ==================== */ -#ifdef CONFIG_SERIAL_CONSOLE +#ifdef 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,12 +146,12 @@ static int cook_serial(unsigned char ch) static int curses_getchar(int _delay) { -#if defined(CONFIG_USB_HID) || defined(CONFIG_PC_KEYBOARD) || defined(CONFIG_SERIAL_CONSOLE) +#if defined(CONFIG_LP_USB_HID) || defined(CONFIG_LP_PC_KEYBOARD) || defined(CONFIG_LP_SERIAL_CONSOLE) unsigned short c; #endif do { -#ifdef CONFIG_USB_HID +#ifdef CONFIG_LP_USB_HID usb_poll(); if ((curses_flags & F_ENABLE_CONSOLE) && usbhid_havechar()) { @@ -159,7 +159,7 @@ static int curses_getchar(int _delay) if (c != 0) return c; } #endif -#ifdef CONFIG_PC_KEYBOARD +#ifdef CONFIG_LP_PC_KEYBOARD if ((curses_flags & F_ENABLE_CONSOLE) && keyboard_havechar()) { c = keyboard_getchar(); @@ -167,7 +167,7 @@ static int curses_getchar(int _delay) } #endif -#ifdef CONFIG_SERIAL_CONSOLE +#ifdef CONFIG_LP_SERIAL_CONSOLE if ((curses_flags & F_ENABLE_SERIAL) && serial_havechar()) { c = serial_getchar(); @@ -225,7 +225,7 @@ int nocbreak(void) return 0; } -#ifdef CONFIG_VGA_VIDEO_CONSOLE +#ifdef CONFIG_LP_VGA_VIDEO_CONSOLE void curses_enable_vga(int state) { if (state) @@ -243,7 +243,7 @@ void curses_enable_vga(int state) { } int curses_vga_enabled(void) { return 0; } #endif -#ifdef CONFIG_SERIAL_CONSOLE +#ifdef CONFIG_LP_SERIAL_CONSOLE void curses_enable_serial(int state) { if (state) |