GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

src/console: Sanitize headers and IS_ENABLED usage 

Alphabetise headers and remove any #if CONFIG_ guards around them.
Use #if IS_ENABLED(CONFIG_FOO) over #if CONFIG_FOO where applicable.

Change-Id: I2a616bcfb8470a1fa21c9e26271e81cca835272a
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-on: http://review.coreboot.org/6057
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
This commit is contained in:
Edward O'Callaghan 2014-06-17 18:37:08 +10:00 committed by Patrick Georgi
parent 6c99250c3f
commit 0ddb82671c
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/console/console.c
View File

@ -17,14 +17,14 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <rules.h>
#include <console/streams.h>
#include <console/cbmem_console.h> #include <console/cbmem_console.h>
#include <console/ne2k.h>
#include <console/qemu_debugcon.h>
#include <console/spkmodem.h>
#include <console/streams.h>
#include <console/uart.h> #include <console/uart.h>
#include <console/usb.h> #include <console/usb.h>
#include <console/ne2k.h> #include <rules.h>
#include <console/spkmodem.h>
#include <console/qemu_debugcon.h>
void console_hw_init(void) void console_hw_init(void)
{ {

14
src/console/printk.c
View File

@ -5,12 +5,12 @@
* *
*/ */
#include <stddef.h>
#include <smp/node.h>
#include <smp/spinlock.h>
#include <console/vtxprintf.h>
#include <console/console.h> #include <console/console.h>
#include <console/streams.h> #include <console/streams.h>
#include <console/vtxprintf.h>
#include <smp/spinlock.h>
#include <smp/node.h>
#include <stddef.h>
#include <trace.h> #include <trace.h>
DECLARE_SPIN_LOCK(console_lock) DECLARE_SPIN_LOCK(console_lock)
@ -35,7 +35,7 @@ int do_printk(int msg_level, const char *fmt, ...)
if (!console_log_level(msg_level)) if (!console_log_level(msg_level))
return 0; return 0;
#if CONFIG_SQUELCH_EARLY_SMP && defined(__PRE_RAM__) #if IS_ENABLED (CONFIG_SQUELCH_EARLY_SMP) && defined(__PRE_RAM__)
if (!boot_cpu()) if (!boot_cpu())
return 0; return 0;
#endif #endif
@ -55,10 +55,10 @@ int do_printk(int msg_level, const char *fmt, ...)
return i; return i;
} }
#if CONFIG_CHROMEOS #if IS_ENABLED (CONFIG_CHROMEOS)
void do_vtxprintf(const char *fmt, va_list args) void do_vtxprintf(const char *fmt, va_list args)
{ {
vtxprintf(wrap_putchar, fmt, args, NULL); vtxprintf(wrap_putchar, fmt, args, NULL);
console_tx_flush(); console_tx_flush();
} }
#endif #endif /* CONFIG_CHROMEOS */

2
src/console/vsprintf.c
View File

@ -19,8 +19,8 @@
* MA 02110-1301 USA * MA 02110-1301 USA
*/ */
#include <string.h>
#include <console/vtxprintf.h> #include <console/vtxprintf.h>
#include <string.h>
#include <trace.h> #include <trace.h>
struct vsnprintf_context struct vsnprintf_context

2
src/console/vtxprintf.c
View File

@ -4,9 +4,9 @@
* Copyright (C) 1991, 1992 Linus Torvalds * Copyright (C) 1991, 1992 Linus Torvalds
*/ */
#include <string.h>
#include <console/console.h> #include <console/console.h>
#include <console/vtxprintf.h> #include <console/vtxprintf.h>
#include <string.h>
#define call_tx(x) tx_byte(x, data) #define call_tx(x) tx_byte(x, data)