projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with /home/m8/git/u-boot
[oweals/u-boot.git]
/
board
/
pcippc2
/
sconsole.c
diff --git
a/board/pcippc2/sconsole.c
b/board/pcippc2/sconsole.c
index a9f2b298116a8d68f9fbda2ac6f85e0c427d10de..3b190699f08557a9f79c40a658fb7969ec1b7a92 100644
(file)
--- a/
board/pcippc2/sconsole.c
+++ b/
board/pcippc2/sconsole.c
@@
-26,6
+26,8
@@
#include "sconsole.h"
#include "sconsole.h"
+DECLARE_GLOBAL_DATA_PTR;
+
void (*sconsole_putc) (char) = 0;
void (*sconsole_puts) (const char *) = 0;
int (*sconsole_getc) (void) = 0;
void (*sconsole_putc) (char) = 0;
void (*sconsole_puts) (const char *) = 0;
int (*sconsole_getc) (void) = 0;
@@
-34,8
+36,6
@@
void (*sconsole_setbrg) (void) = 0;
int serial_init (void)
{
int serial_init (void)
{
- DECLARE_GLOBAL_DATA_PTR;
-
sconsole_buffer_t *sb = SCONSOLE_BUFFER;
sb->pos = 0;
sconsole_buffer_t *sb = SCONSOLE_BUFFER;
sb->pos = 0;
@@
-104,8
+104,6
@@
int serial_tstc (void)
void serial_setbrg (void)
{
void serial_setbrg (void)
{
- DECLARE_GLOBAL_DATA_PTR;
-
if (sconsole_setbrg) {
(*sconsole_setbrg) ();
} else {
if (sconsole_setbrg) {
(*sconsole_setbrg) ();
} else {