Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[Serial] Split serial console from serial driver
  • Loading branch information
stefanha authored and Michael Brown committed Jun 4, 2008
1 parent f866b17 commit 831db76
Show file tree
Hide file tree
Showing 5 changed files with 62 additions and 32 deletions.
2 changes: 1 addition & 1 deletion src/core/config.c
Expand Up @@ -54,7 +54,7 @@
REQUIRE_OBJECT ( bios_console );
#endif
#ifdef CONSOLE_SERIAL
REQUIRE_OBJECT ( serial );
REQUIRE_OBJECT ( serial_console );
#endif
#ifdef CONSOLE_DIRECT_VGA
REQUIRE_OBJECT ( video_subr );
Expand Down
42 changes: 13 additions & 29 deletions src/core/serial.c
Expand Up @@ -12,10 +12,10 @@
*/

#include "stddef.h"
#include "console.h"
#include <gpxe/init.h>
#include "io.h"
#include <unistd.h>
#include <gpxe/serial.h>
#include "config/serial.h"

/* Set default values if none specified */
Expand Down Expand Up @@ -91,13 +91,11 @@
#define uart_writeb(val,addr) outb((val),(addr))
#endif

struct console_driver serial_console __console_driver;

/*
* void serial_putc(int ch);
* Write character `ch' to port UART_BASE.
*/
static void serial_putc ( int ch ) {
void serial_putc ( int ch ) {
int i;
int status;
i = 1000; /* timeout */
Expand All @@ -116,7 +114,7 @@ static void serial_putc ( int ch ) {
* int serial_getc(void);
* Read a character from port UART_BASE.
*/
static int serial_getc ( void ) {
int serial_getc ( void ) {
int status;
int ch;
do {
Expand All @@ -135,7 +133,7 @@ static int serial_getc ( void ) {
* If there is a character in the input buffer of port UART_BASE,
* return nonzero; otherwise return 0.
*/
static int serial_ischar ( void ) {
int serial_ischar ( void ) {
int status;
status = uart_readb(UART_BASE + UART_LSR); /* line status reg; */
return status & 1; /* rx char available */
Expand Down Expand Up @@ -217,7 +215,6 @@ static void serial_init ( void ) {
/* line status reg */
status = uart_readb(UART_BASE + UART_LSR);
} while(status & UART_LSR_DR);
serial_console.disabled = 0;
out:
return;
}
Expand All @@ -229,10 +226,6 @@ static void serial_init ( void ) {
*/
static void serial_fini ( void ) {
int i, status;
if (serial_console.disabled) {
/* no serial interface */
return;
}
/* Flush the output buffer to avoid dropping characters,
* if we are reinitializing the serial port.
*/
Expand All @@ -243,26 +236,17 @@ static void serial_fini ( void ) {
/* Don't mark it as disabled; it's still usable */
}

struct console_driver serial_console __console_driver = {
.putchar = serial_putc,
.getchar = serial_getc,
.iskey = serial_ischar,
.disabled = 1,
};

/** Serial console startup function */
struct startup_fn serial_startup_fn __startup_fn ( STARTUP_NORMAL ) = {
.startup = serial_init,
.shutdown = serial_fini,
};

/**
* Serial console initialisation function
* Serial driver initialisation function
*
* Initialise console early on so that it is available to capture
* early debug messages. It is safe to call serial_init() multiple
* times.
* Initialise serial port early on so that it is available to capture
* early debug messages.
*/
struct init_fn serial_init_fn __init_fn ( INIT_CONSOLE ) = {
struct init_fn serial_init_fn __init_fn ( INIT_SERIAL ) = {
.initialise = serial_init,
};

/** Serial driver startup function */
struct startup_fn serial_startup_fn __startup_fn ( STARTUP_NORMAL ) = {
.shutdown = serial_fini,
};
31 changes: 31 additions & 0 deletions src/core/serial_console.c
@@ -0,0 +1,31 @@
#include <gpxe/init.h>
#include <gpxe/serial.h>
#include "console.h"

/** @file
*
* Serial console
*
*/

struct console_driver serial_console __console_driver;

static void serial_console_init ( void ) {
/* Serial driver initialization should already be done,
* time to enable the serial console. */
serial_console.disabled = 0;
}

struct console_driver serial_console __console_driver = {
.putchar = serial_putc,
.getchar = serial_getc,
.iskey = serial_ischar,
.disabled = 1,
};

/**
* Serial console initialisation function
*/
struct init_fn serial_console_init_fn __init_fn ( INIT_CONSOLE ) = {
.initialise = serial_console_init,
};
5 changes: 3 additions & 2 deletions src/include/gpxe/init.h
Expand Up @@ -22,8 +22,9 @@ struct init_fn {
*/

#define INIT_EARLY 01 /**< Early initialisation */
#define INIT_CONSOLE 02 /**< Console initialisation */
#define INIT_NORMAL 03 /**< Normal initialisation */
#define INIT_SERIAL 02 /**< Serial driver initialisation */
#define INIT_CONSOLE 03 /**< Console initialisation */
#define INIT_NORMAL 04 /**< Normal initialisation */

/** @} */

Expand Down
14 changes: 14 additions & 0 deletions src/include/gpxe/serial.h
@@ -0,0 +1,14 @@
#ifndef _GPXE_SERIAL_H
#define _GPXE_SERIAL_H

/** @file
*
* Serial driver functions
*
*/

extern void serial_putc ( int ch );
extern int serial_getc ( void );
extern int serial_ischar ( void );

#endif /* _GPXE_SERIAL_H */

0 comments on commit 831db76

Please sign in to comment.