Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d197c43d authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files

printk: add console_cmdline.h 



Add an include file for the console_cmdline struct so that the braille
console driver can be separated.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>
Cc: Ming Lei <ming.lei@canonical.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b9ee979e

kernel/printk/console_cmdline.h

0 → 100644
+14 −0
Original line number Diff line number Diff line 
#ifndef _CONSOLE_CMDLINE_H

#define _CONSOLE_CMDLINE_H



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

};



#endif

kernel/printk/printk.c

+3 −9
Original line number Diff line number Diff line
@@ -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;