|
@@ -51,6 +51,8 @@
|
|
|
#define CREATE_TRACE_POINTS
|
|
|
#include <trace/events/printk.h>
|
|
|
|
|
|
+#include "console_cmdline.h"
|
|
|
+
|
|
|
/* printk's without a loglevel use this.. */
|
|
|
#define DEFAULT_MESSAGE_LOGLEVEL CONFIG_DEFAULT_MESSAGE_LOGLEVEL
|
|
|
|
|
@@ -105,19 +107,11 @@ static struct console *exclusive_console;
|
|
|
/*
|
|
|
* Array of consoles built from command line options (console=)
|
|
|
*/
|
|
|
-struct console_cmdline
|
|
|
-{
|
|
|
- char name[8]; /* Name of the driver */
|
|
|
- int index; /* Minor dev. to use */
|
|
|
- char *options; /* Options for the driver */
|
|
|
-#ifdef CONFIG_A11Y_BRAILLE_CONSOLE
|
|
|
- char *brl_options; /* Options for braille driver */
|
|
|
-#endif
|
|
|
-};
|
|
|
|
|
|
#define MAX_CMDLINECONSOLES 8
|
|
|
|
|
|
static struct console_cmdline console_cmdline[MAX_CMDLINECONSOLES];
|
|
|
+
|
|
|
static int selected_console = -1;
|
|
|
static int preferred_console = -1;
|
|
|
int console_set_on_cmdline;
|