diff options
| author | Helge Deller <deller@gmx.de> | 2022-04-05 13:55:40 +0200 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2022-05-11 18:37:38 +0200 |
| commit | 5649963e6f69e1f7433e9ef5b1957124347ec663 (patch) | |
| tree | 91a25c08e0a4c74ec3f5ba781f57d86095deb83d | |
| parent | 5cec13f11d3917cf3bceaf68ce23e9fa5f206a35 (diff) | |
| download | seabios-hppa-5649963e6f69e1f7433e9ef5b1957124347ec663.zip seabios-hppa-5649963e6f69e1f7433e9ef5b1957124347ec663.tar.gz seabios-hppa-5649963e6f69e1f7433e9ef5b1957124347ec663.tar.bz2 | |
Move PAGE0 to hppa.h and fix sti_putchar() to take selected font
Signed-off-by: Helge Deller <deller@gmx.de>
| -rw-r--r-- | src/parisc/hppa.h | 3 | ||||
| -rw-r--r-- | src/parisc/sti.c | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/parisc/hppa.h b/src/parisc/hppa.h index ca81a43..1bf601f 100644 --- a/src/parisc/hppa.h +++ b/src/parisc/hppa.h @@ -9,6 +9,9 @@ #include "types.h" // u32 #include "byteorder.h" // le16_to_cpu +/* Pointer to zero-page of PA-RISC */ +#define PAGE0 ((volatile struct zeropage *) 0UL) + #define PSW_I 0x00000001 static inline unsigned long arch_local_save_flags(void) diff --git a/src/parisc/sti.c b/src/parisc/sti.c index 7c7fb54..7743d7c 100644 --- a/src/parisc/sti.c +++ b/src/parisc/sti.c @@ -13,8 +13,7 @@ #include "parisc/hppa_hardware.h" #include "output.h" #include "pdc.h" - -#define PAGE0 ((volatile struct zeropage *) 0UL) +#include "hppa.h" static int sti_enabled; @@ -85,7 +84,7 @@ static void sti_putchar(struct sti_rom *rom, int row, int column, const char c) sti_font_inptr.dest_x = column * font->width; sti_font_inptr.dest_y = row * font->height; sti_font_inptr.index = c; - sti_font_inptr.font_start_addr = (u32)rom + rom->font_start; + sti_font_inptr.font_start_addr = (u32) font; sti_unpmv(&sti_font_flags, &sti_font_inptr, &sti_font_outptr, &sti_glob_cfg); |