OpenBIOS June 2013

openbios@openbios.org

13 participants
43 discussions

[PATCH 00/20] Video/console cleanup patch
by Mark Cave-Ayland 15 Jun '13

15 Jun '13

This patch expands on the work from the last patchset and makes the following changes: - Remove the now-obsolete C console files/functions - Separate out the video routines into MOL, TCX and VGA paths - Unify the video descriptor with Forth (instead of having both a C struct and Forth variables holding video information, have the C struct members point directly to the relevant dictionary cells) - Fix any bugs found as a result of the refactoring above - Add new debug-type and debug-cr words for debugging over the serial port even when video mode is enabled - Remove the cls() from the serial console for SPARC32/64 - Fix a decode-string off-by-one property bug The next stage after this will be to switch the TCX video initialisation path over to use Forth FCode evaluation in conjunction with a set of new probe functions. Mark Cave-Ayland (20): video_common.c: remove video_open() and video_write() methods libopenbios: remove the C terminal emulator file console_common.c packages: rename video.c to molvideo.c ready for MOL-specific video routines video_common.c: remove manual screen clear since fb8-erase-screen does this now video_common.c: move startup_splash() and refresh_palette() to packages/molvideo.c video_common.c: now fill_rect() is no longer called directly, merge it into the video_fill_rect() video_common.c: remove video_scroll1() and draw_pixel() as they are no longer needed video_common.c: rename get_color() and set_color() functions video_common.c: Move osi_fb_info_t struct contents directly into the video_info struct video_common.c: unify the video_info structure with Forth video_common.c: split video setup routines into setup_video() video_common.c: remove the video_get_res() function video_common.c: move colour palette code into individual devices sbus.c: fix TCX24 initialisation video_common.c: fix 32-bit display modes on 64-bit architectures video_common.c: remove init_video() function console: remove libopenbios/console.h bootstrap.fs: add debug-type and debug-cr words SPARC: remove cls() from the console startup property.fs: fix off-by-one error in decode-string openbios-devel/arch/sparc32/boot.h | 3 - openbios-devel/arch/sparc32/console.c | 36 +-- openbios-devel/arch/sparc32/openbios.c | 4 +- openbios-devel/arch/sparc64/console.c | 12 - openbios-devel/arch/sparc64/openbios.c | 2 - openbios-devel/arch/x86/openbios.c | 8 +- openbios-devel/config/scripts/switch-arch | 4 + openbios-devel/drivers/sbus.c | 13 + openbios-devel/drivers/vga_vbe.c | 87 +++--- openbios-devel/forth/bootstrap/bootstrap.fs | 2 + openbios-devel/forth/device/display.fs | 38 ++- openbios-devel/forth/device/property.fs | 2 +- openbios-devel/include/arch/sparc32/io.h | 7 + openbios-devel/include/drivers/drivers.h | 1 + openbios-devel/include/libopenbios/console.h | 9 - openbios-devel/include/libopenbios/video.h | 48 +-- openbios-devel/libopenbios/build.xml | 1 - openbios-devel/libopenbios/console_common.c | 416 -------------------------- openbios-devel/libopenbios/video_common.c | 377 +++++++---------------- openbios-devel/packages/build.xml | 2 +- openbios-devel/packages/molvideo.c | 172 +++++++++++ openbios-devel/packages/video.c | 90 ------ 22 files changed, 442 insertions(+), 892 deletions(-) delete mode 100644 openbios-devel/include/libopenbios/console.h delete mode 100644 openbios-devel/libopenbios/console_common.c create mode 100644 openbios-devel/packages/molvideo.c delete mode 100644 openbios-devel/packages/video.c -- 1.7.10.4

1 20

[PATCH] macio: Rename arch_nvram_{put,get,size}()
by Andreas Färber 09 Jun '13

09 Jun '13

PReP does not have MacIO, so don't call its functions arch_*. Instead indirect from arch_* functions to macio_* functions via is_apple(). Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> --- arch/ppc/qemu/qemu.c | 22 ++++++++++++++++++++++ drivers/macio.c | 6 +++--- include/drivers/drivers.h | 5 +++++ 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/arch/ppc/qemu/qemu.c b/arch/ppc/qemu/qemu.c index 208669c..bed5bb3 100644 --- a/arch/ppc/qemu/qemu.c +++ b/arch/ppc/qemu/qemu.c @@ -76,3 +76,25 @@ printk( const char *fmt, ... ) } return i; } + +int arch_nvram_size(void) +{ + if (is_apple()) { + return macio_nvram_size(); + } + return 0; +} + +void arch_nvram_put(char *buf) +{ + if (is_apple()) { + macio_nvram_put(buf); + } +} + +void arch_nvram_get(char *buf) +{ + if (is_apple()) { + macio_nvram_get(buf); + } +} diff --git a/drivers/macio.c b/drivers/macio.c index 59ad1f6..c6aee0a 100644 --- a/drivers/macio.c +++ b/drivers/macio.c @@ -35,7 +35,7 @@ static char *nvram; int -arch_nvram_size( void ) +macio_nvram_size(void) { if (is_oldworld()) return OW_IO_NVRAM_SIZE >> OW_IO_NVRAM_SHIFT; @@ -100,7 +100,7 @@ dump_nvram(void) void -arch_nvram_put( char *buf ) +macio_nvram_put(char *buf) { int i; unsigned int it_shift; @@ -119,7 +119,7 @@ arch_nvram_put( char *buf ) } void -arch_nvram_get( char *buf ) +macio_nvram_get(char *buf) { int i; unsigned int it_shift; diff --git a/include/drivers/drivers.h b/include/drivers/drivers.h index d139ace..5e1f9f1 100644 --- a/include/drivers/drivers.h +++ b/include/drivers/drivers.h @@ -123,6 +123,11 @@ int keyboard_dataready(void); unsigned char keyboard_readdata(void); #endif #endif +#ifdef CONFIG_DRIVER_MACIO +int macio_nvram_size(void); +void macio_nvram_put(char *buf); +void macio_nvram_get(char *buf); +#endif /* drivers/timer.c */ void setup_timers(void); -- 1.8.1.4

2 1

[commit] r1156 - in trunk/openbios-devel: arch/sparc32 drivers
by repository service 09 Jun '13

09 Jun '13

Author: mcayland Date: Sun Jun 9 14:25:46 2013 New Revision: 1156 URL: http://tracker.coreboot.org/trac/openbios/changeset/1156 Log: video: switch VGA and TCX drivers over to Forth console using is-install. Here we install the Forth terminal console instead of the C console for the VGA and TCX drivers. Note that this patch also disables video output for SPARC32 when CONFIG_DEBUG_CONSOLE_VIDEO is enabled, since these routines write directly to the screen instead of using the Forth bindings causing some display issues. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc32/console.c trunk/openbios-devel/drivers/pci.c trunk/openbios-devel/drivers/sbus.c Modified: trunk/openbios-devel/arch/sparc32/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/console.c Sun Jun 9 14:25:43 2013 (r1155) +++ trunk/openbios-devel/arch/sparc32/console.c Sun Jun 9 14:25:46 2013 (r1156) @@ -30,15 +30,6 @@ unsigned char *vmem; volatile uint32_t *dac; -static void video_putchar(int c) -{ - char buf; - - buf = c & 0xff; - - console_draw_fstr(&buf, 1); -} - static void video_cls(void) { memset((void *)vmem, 0, VMEM_SIZE); @@ -63,9 +54,6 @@ #ifdef CONFIG_DEBUG_CONSOLE_SERIAL serial_putchar(c); #endif -#ifdef CONFIG_DEBUG_CONSOLE_VIDEO - video_putchar(c); -#endif return c; } Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Sun Jun 9 14:25:43 2013 (r1155) +++ trunk/openbios-devel/drivers/pci.c Sun Jun 9 14:25:46 2013 (r1156) @@ -764,12 +764,16 @@ int vga_config_cb (const pci_config_t *config) { - if (config->assigned[0] != 0x00000000) + if (config->assigned[0] != 0x00000000) { vga_vbe_init(config->path, pci_bus_addr_to_host_addr(config->assigned[0] & ~0x0000000F), config->sizes[0], pci_bus_addr_to_host_addr(config->assigned[1] & ~0x0000000F), config->sizes[1]); + + feval("['] qemu-vga-driver-init is-install"); + } + return 0; } Modified: trunk/openbios-devel/drivers/sbus.c ============================================================================== --- trunk/openbios-devel/drivers/sbus.c Sun Jun 9 14:25:43 2013 (r1155) +++ trunk/openbios-devel/drivers/sbus.c Sun Jun 9 14:25:46 2013 (r1156) @@ -329,6 +329,8 @@ fword("property"); } + feval("['] qemu-tcx-driver-init is-install"); + chosen = find_dev("/chosen"); push_str(path); fword("open-dev");

1 0

[commit] r1155 - trunk/openbios-devel/forth/device
by repository service 09 Jun '13

09 Jun '13

Author: mcayland Date: Sun Jun 9 14:25:43 2013 New Revision: 1155 URL: http://tracker.coreboot.org/trac/openbios/changeset/1155 Log: display.fs: add implementation of fb8-insert-characters and fb8-delete-characters. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/forth/device/display.fs Modified: trunk/openbios-devel/forth/device/display.fs ============================================================================== --- trunk/openbios-devel/forth/device/display.fs Sun Jun 9 14:25:39 2013 (r1154) +++ trunk/openbios-devel/forth/device/display.fs Sun Jun 9 14:25:43 2013 (r1155) @@ -175,7 +175,12 @@ frame-buffer-adr + window-left depth-bytes * + ; - + +: fb8-curpos2addr ( col line -- addr ) + char-height * fb8-line2addr + swap char-width * depth-bytes * + +; + : fb8-copy-lines ( count from to -- ) fb8-line2addr swap fb8-line2addr swap @@ -253,9 +258,41 @@ ; : fb8-insert-characters ( n -- ) - ; + \ numcopy = ( #columns - column# - n ) + #columns over - column# - + char-width * depth-bytes * ( n numbytescopy ) + + over column# + line# fb8-curpos2addr + column# line# fb8-curpos2addr ( n numbytescopy destaddr srcaddr ) + char-height 0 do + 3dup swap rot move + line-bytes + swap line-bytes + swap + loop 3drop + background-color + column# char-width * window-left + line# char-height * window-top + + 3 pick char-width * char-height + fb8-fillrect + drop + ; + : fb8-delete-characters ( n -- ) + \ numcopy = ( #columns - column# - n ) + #columns over - column# - + char-width * depth-bytes * ( n numbytescopy ) + + over column# + line# fb8-curpos2addr + column# line# fb8-curpos2addr swap ( n numbytescopy destaddr srcaddr ) + char-height 0 do + 3dup swap rot move + line-bytes + swap line-bytes + swap + loop 3drop + + background-color + over #columns swap - char-width * window-left + line# char-height * window-top + + 3 pick char-width * char-height + fb8-fillrect + drop ; : fb8-insert-lines ( n -- )

1 0

[commit] r1154 - trunk/openbios-devel/forth/device
by repository service 09 Jun '13

09 Jun '13

Author: mcayland Date: Sun Jun 9 14:25:39 2013 New Revision: 1154 URL: http://tracker.coreboot.org/trac/openbios/changeset/1154 Log: display.fs: add implementation of fb8-insert-lines. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/forth/device/display.fs Modified: trunk/openbios-devel/forth/device/display.fs ============================================================================== --- trunk/openbios-devel/forth/device/display.fs Sun Jun 9 14:25:36 2013 (r1153) +++ trunk/openbios-devel/forth/device/display.fs Sun Jun 9 14:25:39 2013 (r1154) @@ -259,6 +259,14 @@ ; : fb8-insert-lines ( n -- ) + \ numcopy = ( #lines - n ) + #lines over - char-height * + over line# char-height * + swap char-height * over + + fb8-copy-lines + + char-height * line# char-height * + fb8-clear-lines ; : fb8-delete-lines ( n -- )

1 0

[commit] r1153 - trunk/openbios-devel/forth/device
by repository service 09 Jun '13

09 Jun '13

Author: mcayland Date: Sun Jun 9 14:25:36 2013 New Revision: 1153 URL: http://tracker.coreboot.org/trac/openbios/changeset/1153 Log: terminal.fs: Fix CSI n;mH and CSI n;mf control sequences. Fix an off-by-one error in the lines/columns calculations and also ensure that we correctly interpret control sequences when not all of the optional parameters are present. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/forth/device/terminal.fs Modified: trunk/openbios-devel/forth/device/terminal.fs ============================================================================== --- trunk/openbios-devel/forth/device/terminal.fs Sun Jun 9 14:25:33 2013 (r1152) +++ trunk/openbios-devel/forth/device/terminal.fs Sun Jun 9 14:25:36 2013 (r1153) @@ -97,17 +97,39 @@ endof ascii f of 2 (esc-number) - 2 = if - #columns 1- min to column# - #lines 1- min to line# - then + case + 2 of + 1- #columns 1- min to column# + 1- #lines 1- min to line# + endof + 1 of + 0 to column# + 1- #lines 1- min to line# + endof + 0 of + 0 to column# + 0 to line# + drop + endof + endcase endof ascii H of - 2 (esc-number) - 2 = if - #columns 1- min to column# - #lines 1- min to line# - then + 2 (esc-number) + case + 2 of + 1- #columns 1- min to column# + 1- #lines 1- min to line# + endof + 1 of + 0 to column# + 1- #lines 1- min to line# + endof + 0 of + 0 to column# + 0 to line# + drop + endof + endcase endof ascii J of 0 to (escseq)

1 0

[commit] r1152 - trunk/openbios-devel/forth/device
by repository service 09 Jun '13

09 Jun '13

Author: mcayland Date: Sun Jun 9 14:25:33 2013 New Revision: 1152 URL: http://tracker.coreboot.org/trac/openbios/changeset/1152 Log: terminal.fs: handle all cursor positioning within the terminal package. Currently the column positioning is handled by the framebuffer code in display.fs where it shouldn't really be. This also fixes a crash bug when window-top is set and a line wraps onto the line beneath it. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/forth/device/display.fs trunk/openbios-devel/forth/device/terminal.fs Modified: trunk/openbios-devel/forth/device/display.fs ============================================================================== --- trunk/openbios-devel/forth/device/display.fs Sun Jun 9 14:25:30 2013 (r1151) +++ trunk/openbios-devel/forth/device/display.fs Sun Jun 9 14:25:33 2013 (r1152) @@ -210,20 +210,6 @@ swap then fb8-blitmask - \ now advance the position - column# 1+ - dup #columns = if - drop 0 to column# - line# 1+ - dup #lines >= if - line# - 0 to line# - 1 delete-lines - then - to line# - else - to column# - then ; : fb8-reset-screen ( -- ) Modified: trunk/openbios-devel/forth/device/terminal.fs ============================================================================== --- trunk/openbios-devel/forth/device/terminal.fs Sun Jun 9 14:25:30 2013 (r1151) +++ trunk/openbios-devel/forth/device/terminal.fs Sun Jun 9 14:25:33 2013 (r1152) @@ -229,12 +229,13 @@ then endof a of \ LF - line# 1+ to line# 0 to column# + line# 1+ to line# + 0 to column# line# #lines >= if - line# 1- 0 to line# 1 delete-lines - to line# + #lines 1- to line# + toggle-cursor exit then endof b of \ VT @@ -253,7 +254,21 @@ 1b (sequence) c! 1 to (escseq) endof + + \ draw character and advance position + column# #columns >= if + 0 to column# + line# 1+ to line# + line# #lines >= if + 0 to line# + 1 delete-lines + #lines 1- to line# + then + then + dup draw-character + column# 1+ to column# + endcase toggle-cursor ;

1 0

[commit] r1151 - trunk/openbios-devel/forth/device
by repository service 09 Jun '13

09 Jun '13

Author: mcayland Date: Sun Jun 9 14:25:30 2013 New Revision: 1151 URL: http://tracker.coreboot.org/trac/openbios/changeset/1151 Log: display.fs: Add vertical font-spacing as per the existing C console implementation. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/forth/device/display.fs Modified: trunk/openbios-devel/forth/device/display.fs ============================================================================== --- trunk/openbios-devel/forth/device/display.fs Sun Jun 9 14:25:27 2013 (r1150) +++ trunk/openbios-devel/forth/device/display.fs Sun Jun 9 14:25:30 2013 (r1151) @@ -44,6 +44,7 @@ 0 value foreground-color 0 value background-color +2 value font-spacing 0 value depth-bytes 0 value line-bytes @@ -82,7 +83,7 @@ to char-num to char-min to fontbytes - to char-height + font-spacing + to char-height to char-width to font ; @@ -192,12 +193,17 @@ ; : fb8-draw-character ( char -- ) + \ erase the current character + background-color + column# char-width * window-left + + line# char-height * window-top + + char-width char-height fb8-fillrect \ draw the character: >font line# char-height * window-top + screen-width * depth-bytes * column# char-width * depth-bytes * window-left depth-bytes * + + frame-buffer-adr + - swap char-width char-height + swap char-width char-height font-spacing - \ normal or inverse? foreground-color background-color inverse? if @@ -234,7 +240,7 @@ : fb8-toggle-cursor ( -- ) column# char-width * window-left + line# char-height * window-top + - char-width char-height + char-width char-height font-spacing - foreground-color background-color fb8-invertrect ;

1 0

[commit] r1150 - trunk/openbios-devel/forth/device
by repository service 09 Jun '13

09 Jun '13

Author: mcayland Date: Sun Jun 9 14:25:27 2013 New Revision: 1150 URL: http://tracker.coreboot.org/trac/openbios/changeset/1150 Log: display.fs: optimise scrolling by copying/deleting multiple scanlines at once. Change fb8-copy-line and fb8-clear-line so that they can operate on multiple lines at once, renaming to fb8-copy-lines and fb8-clear-lines respectively. Integrate these new functions into fb8-delete-lines so that they are used when scrolling the display. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/forth/device/display.fs Modified: trunk/openbios-devel/forth/device/display.fs ============================================================================== --- trunk/openbios-devel/forth/device/display.fs Sun Jun 9 14:25:25 2013 (r1149) +++ trunk/openbios-devel/forth/device/display.fs Sun Jun 9 14:25:27 2013 (r1150) @@ -175,17 +175,20 @@ window-left depth-bytes * + ; -: fb8-copy-line ( from to -- ) - fb8-line2addr swap - fb8-line2addr swap - #columns char-width * depth-bytes * move +: fb8-copy-lines ( count from to -- ) + fb8-line2addr swap + fb8-line2addr swap + #columns char-width * depth-bytes * + 3 pick * move drop ; -: fb8-clear-line ( line -- ) - fb8-line2addr - #columns char-width * depth-bytes * - background-color fill -\ 0 fill +: fb8-clear-lines ( count line -- ) + background-color 0 + 2 pick window-top + + #columns char-width * + 5 pick + fb8-fillrect + 2drop ; : fb8-draw-character ( char -- ) @@ -269,20 +272,14 @@ : fb8-delete-lines ( n -- ) \ numcopy = ( #lines - ( line# + n )) * char-height #lines over line# + - char-height * - - ( numcopy ) 0 ?do - dup line# + char-height * i + - line# char-height * i + - fb8-copy-line - loop - - #lines over - char-height * - over char-height * - 0 ?do - dup i + fb8-clear-line - loop + over line# + char-height * + line# char-height * + fb8-copy-lines - 2drop + #lines over - char-height * + dup #lines char-height * swap - swap + fb8-clear-lines + drop ;

1 0

[commit] r1149 - in trunk/openbios-devel: forth/device include/libopenbios libopenbios packages
by repository service 09 Jun '13

09 Jun '13

Author: mcayland Date: Sun Jun 9 14:25:25 2013 New Revision: 1149 URL: http://tracker.coreboot.org/trac/openbios/changeset/1149 Log: video_common.c: create low-level video_fill_rect() function. Switch fb8-erase-screen in display.fs over to use it. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/forth/device/display.fs trunk/openbios-devel/include/libopenbios/video.h trunk/openbios-devel/libopenbios/video_common.c trunk/openbios-devel/packages/video.c Modified: trunk/openbios-devel/forth/device/display.fs ============================================================================== --- trunk/openbios-devel/forth/device/display.fs Sun Jun 9 14:25:22 2013 (r1148) +++ trunk/openbios-devel/forth/device/display.fs Sun Jun 9 14:25:25 2013 (r1149) @@ -165,6 +165,7 @@ \ bind to low-level C function later defer fb8-blitmask +defer fb8-fillrect defer fb8-invertrect : fb8-line2addr ( line -- addr ) @@ -236,14 +237,13 @@ ; : fb8-erase-screen ( -- ) - frame-buffer-adr - screen-height screen-width * inverse-screen? if foreground-color else background-color then - fill + 0 0 screen-width screen-height + fb8-fillrect ; : fb8-invert-screen ( -- ) Modified: trunk/openbios-devel/include/libopenbios/video.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/video.h Sun Jun 9 14:25:22 2013 (r1148) +++ trunk/openbios-devel/include/libopenbios/video.h Sun Jun 9 14:25:25 2013 (r1149) @@ -9,6 +9,7 @@ void fill_rect(int col_ind, int x, int y, int w, int h); void video_mask_blit(void); void video_invert_rect(void); +void video_fill_rect(void); typedef struct osi_fb_info { unsigned long mphys; Modified: trunk/openbios-devel/libopenbios/video_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/video_common.c Sun Jun 9 14:25:22 2013 (r1148) +++ trunk/openbios-devel/libopenbios/video_common.c Sun Jun 9 14:25:25 2013 (r1149) @@ -339,6 +339,19 @@ PUSH(len); } +/* ( color_ind x y width height -- ) (?) */ +void +video_fill_rect(void) +{ + int h = POP(); + int w = POP(); + int y = POP(); + int x = POP(); + int color_ind = POP(); + + fill_rect( color_ind, x, y, w, h ); +} + void init_video( unsigned long fb, int width, int height, int depth, int rb ) { @@ -391,6 +404,9 @@ PUSH( pointer2cell(video_mask_blit) ); fword("is-noname-cfunc"); feval("to fb8-blitmask"); + PUSH( pointer2cell(video_fill_rect) ); + fword("is-noname-cfunc"); + feval("to fb8-fillrect"); PUSH( pointer2cell(video_invert_rect) ); fword("is-noname-cfunc"); feval("to fb8-invertrect"); Modified: trunk/openbios-devel/packages/video.c ============================================================================== --- trunk/openbios-devel/packages/video.c Sun Jun 9 14:25:22 2013 (r1148) +++ trunk/openbios-devel/packages/video.c Sun Jun 9 14:25:25 2013 (r1149) @@ -71,19 +71,6 @@ refresh_palette(); } -/* ( color_ind x y width height -- ) (?) */ -static void -video_fill_rect( void ) -{ - int h = POP(); - int w = POP(); - int y = POP(); - int x = POP(); - int color_ind = POP(); - - fill_rect( color_ind, x, y, w, h ); -} - NODE_METHODS( video ) = { {"dimensions", video_dimensions }, {"set-colors", video_set_colors },

1 0