diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2008-12-13 11:10:37 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2008-12-13 11:10:37 -0500 |
| commit | 15157a3c6d5a84088532cf26b631224a18c78cbb (patch) | |
| tree | fd30dad906cd5df96153857210b562d600256cb5 /src/output.c | |
| parent | 4e6c9706240a33e13de3da98815d8f4d281a9e9a (diff) | |
| download | seabios-hppa-15157a3c6d5a84088532cf26b631224a18c78cbb.zip seabios-hppa-15157a3c6d5a84088532cf26b631224a18c78cbb.tar.gz seabios-hppa-15157a3c6d5a84088532cf26b631224a18c78cbb.tar.bz2 | |
Implement GET/SET_GLOBAL(...) instead of using GET/SET_VAR(CS, ...)
Diffstat (limited to 'src/output.c')
| -rw-r--r-- | src/output.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/output.c b/src/output.c index b09677e..6a56d45 100644 --- a/src/output.c +++ b/src/output.c @@ -10,6 +10,7 @@ #include "util.h" // printf #include "bregs.h" // struct bregs #include "config.h" // CONFIG_* +#include "biosvar.h" // GET_GLOBAL #define DEBUG_PORT 0x03f8 #define DEBUG_TIMEOUT 100000 @@ -96,7 +97,7 @@ static void puts_cs(u16 action, const char *s) { for (;; s++) { - char c = GET_VAR(CS, *(u8*)s); + char c = GET_GLOBAL(*(u8*)s); if (!c) break; putc(action, c); @@ -156,7 +157,7 @@ bvprintf(u16 action, const char *fmt, va_list args) { const char *s = fmt; for (;; s++) { - char c = GET_VAR(CS, *(u8*)s); + char c = GET_GLOBAL(*(u8*)s); if (!c) break; if (c != '%') { @@ -165,7 +166,7 @@ bvprintf(u16 action, const char *fmt, va_list args) } const char *n = s+1; for (;;) { - c = GET_VAR(CS, *(u8*)n); + c = GET_GLOBAL(*(u8*)n); if (!isdigit(c)) break; n++; @@ -173,7 +174,7 @@ bvprintf(u16 action, const char *fmt, va_list args) if (c == 'l') { // Ignore long format indicator n++; - c = GET_VAR(CS, *(u8*)n); + c = GET_GLOBAL(*(u8*)n); } s32 val; const char *sarg; @@ -204,7 +205,7 @@ bvprintf(u16 action, const char *fmt, va_list args) break; case '.': // Hack to support "%.s" - meaning string on stack. - if (GET_VAR(CS, *(u8*)(n+1)) != 's') + if (GET_GLOBAL(*(u8*)(n+1)) != 's') break; n++; sarg = va_arg(args, const char *); |