diff options
Diffstat (limited to 'src/console')
| -rw-r--r-- | src/console/console.c | 4 | ||||
| -rw-r--r-- | src/console/printk.c | 4 | ||||
| -rw-r--r-- | src/console/uart8250_console.c | 30 |
3 files changed, 19 insertions, 19 deletions
diff --git a/src/console/console.c b/src/console/console.c index af790de217..78823afdb5 100644 --- a/src/console/console.c +++ b/src/console/console.c @@ -15,7 +15,7 @@ void console_init(void) { struct console_driver *driver; if(get_option(&console_loglevel, "debug_level")) - console_loglevel=DEFAULT_CONSOLE_LOGLEVEL; + console_loglevel=CONFIG_DEFAULT_CONSOLE_LOGLEVEL; for(driver = console_drivers; driver < econsole_drivers; driver++) { if (!driver->init) @@ -83,7 +83,7 @@ int console_tst_byte(void) */ void post_code(uint8_t value) { -#if !defined(NO_POST) || NO_POST==0 +#if !defined(CONFIG_NO_POST) || CONFIG_NO_POST==0 #if CONFIG_SERIAL_POST==1 printk_emerg("POST: 0x%02x\n", value); #endif diff --git a/src/console/printk.c b/src/console/printk.c index 01a52afc4c..0485a001da 100644 --- a/src/console/printk.c +++ b/src/console/printk.c @@ -17,10 +17,10 @@ /* Keep together for sysctl support */ -int console_loglevel = DEFAULT_CONSOLE_LOGLEVEL; +int console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL; int default_message_loglevel = DEFAULT_MESSAGE_LOGLEVEL; int minimum_console_loglevel = MINIMUM_CONSOLE_LOGLEVEL; -int default_console_loglevel = DEFAULT_CONSOLE_LOGLEVEL; +int default_console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL; void display(char*); extern int vtxprintf(void (*)(unsigned char), const char *, va_list); diff --git a/src/console/uart8250_console.c b/src/console/uart8250_console.c index 37364e710d..fd71ff7dc2 100644 --- a/src/console/uart8250_console.c +++ b/src/console/uart8250_console.c @@ -3,54 +3,54 @@ #include <pc80/mc146818rtc.h> /* Base Address */ -#ifndef TTYS0_BASE -#define TTYS0_BASE 0x3f8 +#ifndef CONFIG_TTYS0_BASE +#define CONFIG_TTYS0_BASE 0x3f8 #endif -#ifndef TTYS0_BAUD -#define TTYS0_BAUD 115200 +#ifndef CONFIG_TTYS0_BAUD +#define CONFIG_TTYS0_BAUD 115200 #endif -#ifndef TTYS0_DIV -#if ((115200%TTYS0_BAUD) != 0) +#ifndef CONFIG_TTYS0_DIV +#if ((115200%CONFIG_TTYS0_BAUD) != 0) #error Bad ttys0 baud rate #endif -#define TTYS0_DIV (115200/TTYS0_BAUD) +#define CONFIG_TTYS0_DIV (115200/CONFIG_TTYS0_BAUD) #endif /* Line Control Settings */ -#ifndef TTYS0_LCS +#ifndef CONFIG_TTYS0_LCS /* Set 8bit, 1 stop bit, no parity */ -#define TTYS0_LCS 0x3 +#define CONFIG_TTYS0_LCS 0x3 #endif -#define UART_LCS TTYS0_LCS +#define UART_LCS CONFIG_TTYS0_LCS static void ttyS0_init(void) { static const unsigned char div[8]={1,2,3,6,12,24,48,96}; int b_index=0; - unsigned int divisor=TTYS0_DIV; + unsigned int divisor=CONFIG_TTYS0_DIV; if(get_option(&b_index,"baud_rate")==0) { divisor=div[b_index]; } - uart8250_init(TTYS0_BASE, divisor, TTYS0_LCS); + uart8250_init(CONFIG_TTYS0_BASE, divisor, CONFIG_TTYS0_LCS); } static void ttyS0_tx_byte(unsigned char data) { - uart8250_tx_byte(TTYS0_BASE, data); + uart8250_tx_byte(CONFIG_TTYS0_BASE, data); } static unsigned char ttyS0_rx_byte(void) { - return uart8250_rx_byte(TTYS0_BASE); + return uart8250_rx_byte(CONFIG_TTYS0_BASE); } static int ttyS0_tst_byte(void) { - return uart8250_can_rx_byte(TTYS0_BASE); + return uart8250_can_rx_byte(CONFIG_TTYS0_BASE); } static const struct console_driver uart8250_console __console = { |