OpenBIOS July 2013

openbios@openbios.org

13 participants
38 discussions

[commit] r1189 - trunk/openbios-devel/forth/bootstrap
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 12:15:08 2013 New Revision: 1189 URL: http://tracker.coreboot.org/trac/openbios/changeset/1189 Log: bootstrap.fs: add debug-type and debug-cr words These words always output to the debug (serial) port even if video mode is enabled. This makes debugging the video routines much easier when starting QEMU with the -serial stdio option. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs ============================================================================== --- trunk/openbios-devel/forth/bootstrap/bootstrap.fs Sat Jul 27 12:15:05 2013 (r1188) +++ trunk/openbios-devel/forth/bootstrap/bootstrap.fs Sat Jul 27 12:15:08 2013 (r1189) @@ -660,6 +660,7 @@ \ : type 0 do count emit loop drop ; +: debug-type bounds ?do i c@ (emit) loop ; \ \ 7.3.4.1 Text Input @@ -863,6 +864,7 @@ \ : cr linefeed emit ; +: debug-cr linefeed (emit) ; : (cr carret emit ; : space bl emit ; : spaces 0 ?do space loop ;

1 0

[commit] r1188 - in trunk/openbios-devel: arch/sparc32 include/libopenbios libopenbios packages
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 12:15:05 2013 New Revision: 1188 URL: http://tracker.coreboot.org/trac/openbios/changeset/1188 Log: console: remove libopenbios/console.h After all of the shuffling, this file is no longer required. Remove it. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Deleted: trunk/openbios-devel/include/libopenbios/console.h Modified: trunk/openbios-devel/arch/sparc32/console.c trunk/openbios-devel/libopenbios/video_common.c trunk/openbios-devel/packages/molvideo.c Modified: trunk/openbios-devel/arch/sparc32/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/console.c Sat Jul 27 12:15:01 2013 (r1187) +++ trunk/openbios-devel/arch/sparc32/console.c Sat Jul 27 12:15:05 2013 (r1188) @@ -9,7 +9,6 @@ #include "kernel/kernel.h" #include "drivers/drivers.h" #include "openbios.h" -#include "libopenbios/console.h" #include "libopenbios/ofmem.h" #include "libopenbios/video.h" Modified: trunk/openbios-devel/libopenbios/video_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:15:01 2013 (r1187) +++ trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:15:05 2013 (r1188) @@ -16,7 +16,6 @@ #include "config.h" #include "libopenbios/bindings.h" -#include "libopenbios/console.h" #include "libopenbios/fontdata.h" #include "libopenbios/ofmem.h" #include "libopenbios/video.h" Modified: trunk/openbios-devel/packages/molvideo.c ============================================================================== --- trunk/openbios-devel/packages/molvideo.c Sat Jul 27 12:15:01 2013 (r1187) +++ trunk/openbios-devel/packages/molvideo.c Sat Jul 27 12:15:05 2013 (r1188) @@ -21,7 +21,6 @@ #include "drivers/drivers.h" #include "packages/video.h" #include "libopenbios/video.h" -#include "libopenbios/console.h" #include "drivers/vga.h"

1 0

[commit] r1187 - in trunk/openbios-devel: arch/sparc32 drivers include/libopenbios libopenbios
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 12:15:01 2013 New Revision: 1187 URL: http://tracker.coreboot.org/trac/openbios/changeset/1187 Log: video_common.c: remove init_video() function Finally we now have a set of common video routines in video_common.c with per bus initialisers for SBus and PCI. Hence we can remove the now obsolete init_video() function. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/drivers/vga_vbe.c trunk/openbios-devel/include/libopenbios/video.h trunk/openbios-devel/libopenbios/video_common.c Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Sat Jul 27 12:14:56 2013 (r1186) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sat Jul 27 12:15:01 2013 (r1187) @@ -876,7 +876,6 @@ #ifdef CONFIG_DRIVER_SBUS #ifdef CONFIG_DEBUG_CONSOLE_VIDEO setup_video(hwdef->tcx_base + 0x00800000ULL, (unsigned long)vmem); - init_video(); #endif ob_sbus_init(hwdef->iommu_base + 0x1000ULL, qemu_machine_type); #endif Modified: trunk/openbios-devel/drivers/vga_vbe.c ============================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c Sat Jul 27 12:14:56 2013 (r1186) +++ trunk/openbios-devel/drivers/vga_vbe.c Sat Jul 27 12:15:01 2013 (r1187) @@ -27,6 +27,7 @@ #include "drivers/vga.h" #include "libopenbios/video.h" #include "libopenbios/ofmem.h" +#include "packages/video.h" /* VGA init. We use the Bochs VESA VBE extensions */ #define VBE_DISPI_INDEX_ID 0x0 @@ -125,6 +126,7 @@ phys_addr_t phys; phandle_t ph, chosen, aliases, options; char buf[6]; + int size; phys = fb; @@ -152,6 +154,8 @@ set_int_property(ph, "linebytes", VIDEO_DICT_VALUE(video.rb)); set_int_property(ph, "address", (u32)(fb & ~0x0000000F)); + molvideo_init(); + chosen = find_dev("/chosen"); push_str(path); fword("open-dev"); @@ -168,7 +172,6 @@ if (rom_size >= 8) { const char *p; - int size; p = (const char *)rom; if (p[0] == 'N' && p[1] == 'D' && p[2] == 'R' && p[3] == 'V') { @@ -178,5 +181,11 @@ } } - init_video(); +#if defined(CONFIG_OFMEM) && defined(CONFIG_DRIVER_PCI) + size = ((VIDEO_DICT_VALUE(video.h) * VIDEO_DICT_VALUE(video.rb)) + 0xfff) & ~0xfff; + + ofmem_claim_phys( video.mphys, size, 0 ); + ofmem_claim_virt( VIDEO_DICT_VALUE(video.mvirt), size, 0 ); + ofmem_map( video.mphys, VIDEO_DICT_VALUE(video.mvirt), size, ofmem_arch_io_translation_mode(video.mphys) ); +#endif } Modified: trunk/openbios-devel/include/libopenbios/video.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:14:56 2013 (r1186) +++ trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:15:01 2013 (r1187) @@ -20,7 +20,6 @@ #define VGA_DEFAULT_LINEBYTES (VGA_DEFAULT_WIDTH*((VGA_DEFAULT_DEPTH+7)/8)) void setup_video(phys_addr_t phys, ucell virt); -void init_video(void); unsigned long video_get_color(int col_ind); void video_set_color(int ind, unsigned long color); void video_mask_blit(void); @@ -28,8 +27,6 @@ void video_fill_rect(void); extern struct video_info { - int has_video; - volatile ihandle_t *ih; volatile phys_addr_t mphys; volatile ucell *mvirt; Modified: trunk/openbios-devel/libopenbios/video_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:56 2013 (r1186) +++ trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:15:01 2013 (r1187) @@ -31,7 +31,7 @@ video_get_color( int col_ind ) { unsigned long col; - if( !video.has_video || col_ind < 0 || col_ind > 255 ) + if( !VIDEO_DICT_VALUE(video.ih) || col_ind < 0 || col_ind > 255 ) return 0; if( VIDEO_DICT_VALUE(video.depth) == 8 ) return col_ind; @@ -48,7 +48,7 @@ { xt_t hw_xt = 0; - if( !video.has_video || ind < 0 || ind > 255 ) + if( !VIDEO_DICT_VALUE(video.ih) || ind < 0 || ind > 255 ) return; video.pal[ind] = color; @@ -138,7 +138,7 @@ bgcolor = video_get_color(bgcolor); fgcolor = video_get_color(fgcolor); - if (!video.has_video || x < 0 || y < 0 || w <= 0 || h <= 0 || + if (!VIDEO_DICT_VALUE(video.ih) || x < 0 || y < 0 || w <= 0 || h <= 0 || x + w > VIDEO_DICT_VALUE(video.w) || y + h > VIDEO_DICT_VALUE(video.h)) return; @@ -190,7 +190,7 @@ char *pp; unsigned long col = video_get_color(col_ind); - if (!video.has_video || x < 0 || y < 0 || w <= 0 || h <= 0 || + if (!VIDEO_DICT_VALUE(video.ih) || x < 0 || y < 0 || w <= 0 || h <= 0 || x + w > VIDEO_DICT_VALUE(video.w) || y + h > VIDEO_DICT_VALUE(video.h)) return; @@ -279,36 +279,3 @@ } #endif } - -void -init_video(void) -{ -#if defined(CONFIG_OFMEM) && defined(CONFIG_DRIVER_PCI) - int size; -#endif - phandle_t ph=0, saved_ph=0; - - saved_ph = get_cur_dev(); - while( (ph=dt_iterate_type(ph, "display")) ) { - video.has_video = 1; - - set_int_property( ph, "width", VIDEO_DICT_VALUE(video.w) ); - set_int_property( ph, "height", VIDEO_DICT_VALUE(video.h) ); - set_int_property( ph, "depth", VIDEO_DICT_VALUE(video.depth) ); - set_int_property( ph, "linebytes", VIDEO_DICT_VALUE(video.rb) ); - set_int_property( ph, "address", VIDEO_DICT_VALUE(video.mvirt) ); - - activate_dev(ph); - - molvideo_init(); - } - activate_dev(saved_ph); - -#if defined(CONFIG_OFMEM) && defined(CONFIG_DRIVER_PCI) - size = ((VIDEO_DICT_VALUE(video.h) * VIDEO_DICT_VALUE(video.rb)) + 0xfff) & ~0xfff; - - ofmem_claim_phys( video.mphys, size, 0 ); - ofmem_claim_virt( VIDEO_DICT_VALUE(video.mvirt), size, 0 ); - ofmem_map( video.mphys, VIDEO_DICT_VALUE(video.mvirt), size, ofmem_arch_io_translation_mode(video.mphys) ); -#endif -}

1 0

[commit] r1186 - trunk/openbios-devel/libopenbios
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 12:14:56 2013 New Revision: 1186 URL: http://tracker.coreboot.org/trac/openbios/changeset/1186 Log: video_common.c: fix 32-bit display modes on 64-bit architectures Switch from using unsigned long to uint32_t in the 32-bit primitives and unsigned short to uint16_t in the 16-bit primitives. While not a complete fix (endian-swapping, 24-bit mode) it does fix 32-bit display depth on 64-bit architectures such as SPARC64. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/libopenbios/video_common.c Modified: trunk/openbios-devel/libopenbios/video_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:53 2013 (r1185) +++ trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:56 2013 (r1186) @@ -107,9 +107,9 @@ } if( d >= 24 ) - *((unsigned long*)dst) = color; + *((uint32_t*)dst) = color; else if( d >= 15 ) - *((short*)dst) = color; + *((uint16_t*)dst) = color; else *dst = color; @@ -146,7 +146,7 @@ for( ; h--; pp += *(video.rb) ) { int ww = w; if( VIDEO_DICT_VALUE(video.depth) == 24 || VIDEO_DICT_VALUE(video.depth) == 32 ) { - unsigned long *p = (unsigned long*)pp + x; + uint32_t *p = (uint32_t*)pp + x; while( ww-- ) { if (*p == fgcolor) { *p++ = bgcolor; @@ -155,11 +155,11 @@ } } } else if( VIDEO_DICT_VALUE(video.depth) == 16 || VIDEO_DICT_VALUE(video.depth) == 15 ) { - unsigned short *p = (unsigned short*)pp + x; + uint16_t *p = (uint16_t*)pp + x; while( ww-- ) { - if (*p == (unsigned short)fgcolor) { + if (*p == (uint16_t)fgcolor) { *p++ = bgcolor; - } else if (*p == (unsigned short)bgcolor) { + } else if (*p == (uint16_t)bgcolor) { *p++ = fgcolor; } } @@ -198,11 +198,11 @@ for( ; h--; pp += VIDEO_DICT_VALUE(video.rb) ) { int ww = w; if( VIDEO_DICT_VALUE(video.depth) == 24 || VIDEO_DICT_VALUE(video.depth) == 32 ) { - unsigned long *p = (unsigned long*)pp + x; + uint32_t *p = (uint32_t*)pp + x; while( ww-- ) *p++ = col; } else if( VIDEO_DICT_VALUE(video.depth) == 16 || VIDEO_DICT_VALUE(video.depth) == 15 ) { - unsigned short *p = (unsigned short*)pp + x; + uint16_t *p = (uint16_t*)pp + x; while( ww-- ) *p++ = col; } else {

1 0

[commit] r1185 - trunk/openbios-devel/drivers
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 12:14:53 2013 New Revision: 1185 URL: http://tracker.coreboot.org/trac/openbios/changeset/1185 Log: sbus.c: fix TCX24 initialisation Even though we boot in 24-bit enabled mode, OpenBIOS only uses the 8-bit framebuffer. Hence we need to override the depth/linebytes obtained from QEMU to force the graphics subsystem into 8-bit mode, which was what seems to have been happening before this patch series. Note: it seems strange that we have to update the package linebytes property too, however Debian etch freezes if we don't set it to match the 8-bit framebuffer even though it correctly switches to 24-bit mode. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/sbus.c Modified: trunk/openbios-devel/drivers/sbus.c ============================================================================== --- trunk/openbios-devel/drivers/sbus.c Sat Jul 27 12:14:50 2013 (r1184) +++ trunk/openbios-devel/drivers/sbus.c Sat Jul 27 12:14:53 2013 (r1185) @@ -17,6 +17,7 @@ #include "libc/vsprintf.h" #include "drivers/drivers.h" #include "libopenbios/ofmem.h" +#include "libopenbios/video.h" #define SBUS_REGS 0x28 #define SBUS_SLOTS 16 @@ -329,6 +330,17 @@ fword("property"); } + /* Even with a 24-bit enabled TCX card, the control plane is + used in 8-bit mode. So force the video subsystem into 8-bit + mode before initialisation. */ + if (graphic_depth == 24) { + VIDEO_DICT_VALUE(video.depth) = 8; + VIDEO_DICT_VALUE(video.rb) = VIDEO_DICT_VALUE(video.w); + + chosen = get_cur_dev(); + set_int_property(chosen, "linebytes", VIDEO_DICT_VALUE(video.rb)); + } + bind_func("hw-set-color", tcx_hw_set_color); feval("['] qemu-tcx-driver-init is-install");

1 0

[commit] r1184 - in trunk/openbios-devel: arch/sparc32 drivers forth/device include/drivers include/libopenbios libopenbios packages
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 12:14:50 2013 New Revision: 1184 URL: http://tracker.coreboot.org/trac/openbios/changeset/1184 Log: video_common.c: move colour palette code into individual devices Instead if having a large #ifdef .. #endif section in video_set_color(), move the device-specific hardware setters into each display device package. To do this, we keep track of the display ihandle in the video structure and use it to invoke the low-level hardware setter routine (and optional palette refresh) if required. Also since the display-ih isn't called until is-install, defer the colour palette initialisation from init_video() to is-install. 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/sbus.c trunk/openbios-devel/drivers/vga_vbe.c trunk/openbios-devel/forth/device/display.fs trunk/openbios-devel/include/drivers/drivers.h trunk/openbios-devel/include/libopenbios/video.h trunk/openbios-devel/libopenbios/video_common.c trunk/openbios-devel/packages/molvideo.c Modified: trunk/openbios-devel/arch/sparc32/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/console.c Sat Jul 27 12:14:47 2013 (r1183) +++ trunk/openbios-devel/arch/sparc32/console.c Sat Jul 27 12:14:50 2013 (r1184) @@ -11,6 +11,7 @@ #include "openbios.h" #include "libopenbios/console.h" #include "libopenbios/ofmem.h" +#include "libopenbios/video.h" void cls(void); @@ -41,6 +42,22 @@ dac = (uint32_t *)ofmem_map_io(base + DAC_BASE, DAC_SIZE); } +/* ( r g b index -- ) */ +void tcx_hw_set_color(void) +{ + int index = POP(); + int b = POP(); + int g = POP(); + int r = POP(); + + if( VIDEO_DICT_VALUE(video.depth) == 8 ) { + dac[0] = index << 24; + dac[1] = r << 24; // Red + dac[1] = g << 24; // Green + dac[1] = b << 24; // Blue + } +} + #endif /* ****************************************************************** Modified: trunk/openbios-devel/drivers/sbus.c ============================================================================== --- trunk/openbios-devel/drivers/sbus.c Sat Jul 27 12:14:47 2013 (r1183) +++ trunk/openbios-devel/drivers/sbus.c Sat Jul 27 12:14:50 2013 (r1184) @@ -329,6 +329,7 @@ fword("property"); } + bind_func("hw-set-color", tcx_hw_set_color); feval("['] qemu-tcx-driver-init is-install"); chosen = find_dev("/chosen"); Modified: trunk/openbios-devel/drivers/vga_vbe.c ============================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c Sat Jul 27 12:14:47 2013 (r1183) +++ trunk/openbios-devel/drivers/vga_vbe.c Sat Jul 27 12:14:50 2013 (r1184) @@ -103,6 +103,22 @@ vga_build_rgb_palette(); } +/* Low-level Forth accessor to update VGA color registers */ + +/* ( r g b index -- ) */ +static +void vga_hw_set_color(void) +{ + int index = POP(); + int b = POP(); + int g = POP(); + int r = POP(); + + vga_set_color(index, (r & 0xff), + (g & 0xff), + (b & 0xff)); +} + void vga_vbe_init(const char *path, unsigned long fb, uint32_t fb_size, unsigned long rom, uint32_t rom_size) { @@ -128,6 +144,8 @@ ph = get_cur_dev(); #endif + bind_func("hw-set-color", vga_hw_set_color); + set_int_property(ph, "width", VIDEO_DICT_VALUE(video.w)); set_int_property(ph, "height", VIDEO_DICT_VALUE(video.h)); set_int_property(ph, "depth", VIDEO_DICT_VALUE(video.depth)); Modified: trunk/openbios-devel/forth/device/display.fs ============================================================================== --- trunk/openbios-devel/forth/device/display.fs Sat Jul 27 12:14:47 2013 (r1183) +++ trunk/openbios-devel/forth/device/display.fs Sat Jul 27 12:14:50 2013 (r1184) @@ -48,6 +48,7 @@ 2 value font-spacing 0 value depth-bits 0 value line-bytes +0 value display-ih \ internal values read from QEMU firmware interface 0 value qemu-video-addr @@ -353,6 +354,8 @@ 0 to inverse? 0 to inverse-screen? + my-self to display-ih + \ set defer functions to 8bit versions ['] fb8-draw-character to draw-character @@ -375,6 +378,28 @@ then to foreground-color to background-color + \ setup palette + 10101 ['] color-palette cell+ ff 0 do + dup 2 pick i * swap ! cell+ + loop 2drop + + \ special background color + ffffcc ['] color-palette cell+ fe cells + ! + + \ load palette onto the hardware + ['] color-palette cell+ ff 0 do + dup @ ff0000 and d# 16 rshift + 1 pick @ ff00 and d# 8 rshift + 2 pick @ ff and + i + s" hw-set-color" $find if + execute + else + 2drop + then + cell+ + loop drop + \ ... but let's override with some better defaults fe to background-color 0 to foreground-color Modified: trunk/openbios-devel/include/drivers/drivers.h ============================================================================== --- trunk/openbios-devel/include/drivers/drivers.h Sat Jul 27 12:14:47 2013 (r1183) +++ trunk/openbios-devel/include/drivers/drivers.h Sat Jul 27 12:14:50 2013 (r1184) @@ -47,6 +47,7 @@ /* arch/sparc32/console.c */ void tcx_init(uint64_t base); +void tcx_hw_set_color(void); void kbd_init(uint64_t base); #endif #ifdef CONFIG_DRIVER_IDE Modified: trunk/openbios-devel/include/libopenbios/video.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:14:47 2013 (r1183) +++ trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:14:50 2013 (r1184) @@ -30,6 +30,7 @@ extern struct video_info { int has_video; + volatile ihandle_t *ih; volatile phys_addr_t mphys; volatile ucell *mvirt; volatile ucell *rb, *w, *h, *depth; Modified: trunk/openbios-devel/libopenbios/video_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:47 2013 (r1183) +++ trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:50 2013 (r1184) @@ -46,27 +46,30 @@ void video_set_color( int ind, unsigned long color ) { + xt_t hw_xt = 0; + if( !video.has_video || ind < 0 || ind > 255 ) return; video.pal[ind] = color; -#ifdef CONFIG_MOL - if( VIDEO_DICT_VALUE(video.depth) == 8 ) - OSI_SetColor( ind, color ); -#elif defined(CONFIG_SPARC32) -#if defined(CONFIG_DEBUG_CONSOLE_VIDEO) - if( VIDEO_DICT_VALUE(video.depth) == 8 ) { - dac[0] = ind << 24; - dac[1] = ((color >> 16) & 0xff) << 24; // Red - dac[1] = ((color >> 8) & 0xff) << 24; // Green - dac[1] = (color & 0xff) << 24; // Blue - } -#endif -#else - vga_set_color(ind, ((color >> 16) & 0xff), - ((color >> 8) & 0xff), - (color & 0xff)); -#endif + /* Call the low-level hardware setter in the + display package */ + hw_xt = find_ih_method("hw-set-color", VIDEO_DICT_VALUE(video.ih)); + if (hw_xt) { + PUSH((color >> 16) & 0xff); // Red + PUSH((color >> 8) & 0xff); // Green + PUSH(color & 0xff); // Blue + PUSH(ind); + PUSH(hw_xt); + fword("execute"); + } + + /* Call the low-level palette update if required */ + hw_xt = find_ih_method("hw-refresh-palette", VIDEO_DICT_VALUE(video.ih)); + if (hw_xt) { + PUSH(hw_xt); + fword("execute"); + } } /* ( fbaddr maskaddr width height fgcolor bgcolor -- ) */ @@ -219,6 +222,9 @@ video.mphys = phys; + feval("['] display-ih cell+"); + video.ih = cell2pointer(POP()); + feval("['] qemu-video-addr cell+"); video.mvirt = cell2pointer(POP()); feval("['] qemu-video-width cell+"); @@ -277,7 +283,6 @@ void init_video(void) { - int i; #if defined(CONFIG_OFMEM) && defined(CONFIG_DRIVER_PCI) int size; #endif @@ -306,9 +311,4 @@ ofmem_claim_virt( VIDEO_DICT_VALUE(video.mvirt), size, 0 ); ofmem_map( video.mphys, VIDEO_DICT_VALUE(video.mvirt), size, ofmem_arch_io_translation_mode(video.mphys) ); #endif - - for( i=0; i<256; i++ ) - video_set_color( i, i * 0x010101 ); - - video_set_color( 254, 0xffffcc ); } Modified: trunk/openbios-devel/packages/molvideo.c ============================================================================== --- trunk/openbios-devel/packages/molvideo.c Sat Jul 27 12:14:47 2013 (r1183) +++ trunk/openbios-devel/packages/molvideo.c Sat Jul 27 12:14:50 2013 (r1184) @@ -31,15 +31,24 @@ DECLARE_NODE( video, 0, 0, "Tdisplay" ); +#ifdef CONFIG_MOL static void molvideo_refresh_palette( void ) { -#ifdef CONFIG_MOL + if( VIDEO_DICT_VALUE(video.depth) == 8 ) OSI_RefreshPalette(); -#endif } +static void +molvideo_hw_set_color( void ) +{ + + if( VIDEO_DICT_VALUE(video.depth) == 8 ) + OSI_SetColor( ind, color ); +} +#endif + /* ( -- width height ) (?) */ static void molvideo_dimensions( void ) @@ -61,7 +70,6 @@ unsigned long col = (p[0] << 16) | (p[1] << 8) | p[2]; video_set_color( i + start, col ); } - molvideo_refresh_palette(); } /* ( r g b index -- ) */ @@ -75,7 +83,6 @@ unsigned long col = ((r << 16) & 0xff0000) | ((g << 8) & 0x00ff00) | (b & 0xff); /* printk("color!: %08lx %08lx %08lx %08lx\n", r, g, b, index ); */ video_set_color( index, col ); - molvideo_refresh_palette(); } /* ( color_ind x y width height -- ) (?) */ @@ -143,6 +150,10 @@ NODE_METHODS( video ) = { +#ifdef CONFIG_MOL + {"hw-set-color", molvideo_hw_set_color }, + {"hw-refresh-palette", molvideo_refresh_palette}, +#endif {"dimensions", molvideo_dimensions }, {"set-colors", molvideo_set_colors }, {"fill-rectangle", molvideo_fill_rect },

1 0

[commit] r1183 - in trunk/openbios-devel: include/libopenbios libopenbios packages
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 12:14:47 2013 New Revision: 1183 URL: http://tracker.coreboot.org/trac/openbios/changeset/1183 Log: video_common.c: remove the video_get_res() function Now that we've unified the video variables between C and Forth, there is no need to have a dedicated C function to return the current dimensions. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/include/libopenbios/video.h trunk/openbios-devel/libopenbios/video_common.c trunk/openbios-devel/packages/molvideo.c Modified: trunk/openbios-devel/include/libopenbios/video.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:14:44 2013 (r1182) +++ trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:14:47 2013 (r1183) @@ -23,7 +23,6 @@ void init_video(void); unsigned long video_get_color(int col_ind); void video_set_color(int ind, unsigned long color); -int video_get_res(int *w, int *h); void video_mask_blit(void); void video_invert_rect(void); void video_fill_rect(void); Modified: trunk/openbios-devel/libopenbios/video_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:44 2013 (r1182) +++ trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:47 2013 (r1183) @@ -69,18 +69,6 @@ #endif } -int -video_get_res( int *w, int *h ) -{ - if( !video.has_video ) { - *w = *h = 0; - return -1; - } - *w = VIDEO_DICT_VALUE(video.w); - *h = VIDEO_DICT_VALUE(video.h); - return 0; -} - /* ( fbaddr maskaddr width height fgcolor bgcolor -- ) */ void Modified: trunk/openbios-devel/packages/molvideo.c ============================================================================== --- trunk/openbios-devel/packages/molvideo.c Sat Jul 27 12:14:44 2013 (r1182) +++ trunk/openbios-devel/packages/molvideo.c Sat Jul 27 12:14:47 2013 (r1183) @@ -44,10 +44,8 @@ static void molvideo_dimensions( void ) { - int w, h; - (void) video_get_res( &w, &h ); - PUSH( w ); - PUSH( h ); + fword("screen-width"); + fword("screen-height"); } /* ( table start count -- ) (?) */

1 0

[commit] r1182 - in trunk/openbios-devel: arch/sparc32 arch/x86 config/scripts drivers forth/device include/arch/sparc32 include/libopenbios libopenbios
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 12:14:44 2013 New Revision: 1182 URL: http://tracker.coreboot.org/trac/openbios/changeset/1182 Log: video_common.c: split video setup routines into setup_video() Leave per-device work in init_video() for the moment. As part of this commit we fix up switch-arch so that CONFIG_QEMU works for SPARC32 - if we are given the framebuffer information via the QEMU firmware interface we use it. Otherwise fall back to the values of the VGA_DEFAULT_* constants. This commit requires a corresponding patch for QEMU as currently the framebuffer width/height are not passed via the firmware interface for SPARC32. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/arch/x86/openbios.c trunk/openbios-devel/config/scripts/switch-arch trunk/openbios-devel/drivers/vga_vbe.c trunk/openbios-devel/forth/device/display.fs trunk/openbios-devel/include/arch/sparc32/io.h trunk/openbios-devel/include/libopenbios/video.h trunk/openbios-devel/libopenbios/video_common.c Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Sat Jul 27 12:14:41 2013 (r1181) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sat Jul 27 12:14:44 2013 (r1182) @@ -875,7 +875,8 @@ #endif #ifdef CONFIG_DRIVER_SBUS #ifdef CONFIG_DEBUG_CONSOLE_VIDEO - init_video((unsigned long)vmem, 1024, 768, 8, 1024); + setup_video(hwdef->tcx_base + 0x00800000ULL, (unsigned long)vmem); + init_video(); #endif ob_sbus_init(hwdef->iommu_base + 0x1000ULL, qemu_machine_type); #endif Modified: trunk/openbios-devel/arch/x86/openbios.c ============================================================================== --- trunk/openbios-devel/arch/x86/openbios.c Sat Jul 27 12:14:41 2013 (r1181) +++ trunk/openbios-devel/arch/x86/openbios.c Sat Jul 27 12:14:44 2013 (r1182) @@ -16,6 +16,7 @@ #include "drivers/drivers.h" #include "drivers/pci.h" #include "libopenbios/sys_info.h" +#include "libopenbios/video.h" #include "openbios.h" #include "relocate.h" #include "boot.h" @@ -61,7 +62,12 @@ ob_floppy_init("/isa", "floppy0", 0x3f0, 0); #endif #ifdef CONFIG_XBOX - init_video(phys_to_virt(0x3C00000), 640, 480, 32, 2560); + setup_video(0x3C00000, phys_to_virt(0x3C00000)); + + /* Force video to 32-bit depth */ + VIDEO_DICT_VALUE(video.depth) = 32; + + init_video(); node_methods_init(); #endif device_end(); Modified: trunk/openbios-devel/config/scripts/switch-arch ============================================================================== --- trunk/openbios-devel/config/scripts/switch-arch Sat Jul 27 12:14:41 2013 (r1181) +++ trunk/openbios-devel/config/scripts/switch-arch Sat Jul 27 12:14:44 2013 (r1182) @@ -198,6 +198,10 @@ xbox-x86) xbox="yes" ;; + builtin-sparc32) + builtin="yes" + qemu="yes" + ;; builtin-sparc64) builtin="yes" qemu="yes" Modified: trunk/openbios-devel/drivers/vga_vbe.c ============================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c Sat Jul 27 12:14:41 2013 (r1181) +++ trunk/openbios-devel/drivers/vga_vbe.c Sat Jul 27 12:14:44 2013 (r1182) @@ -103,50 +103,24 @@ vga_build_rgb_palette(); } -#ifdef CONFIG_VGA_WIDTH -#define VGA_DEFAULT_WIDTH CONFIG_VGA_WIDTH -#else -#define VGA_DEFAULT_WIDTH 800 -#endif - -#ifdef CONFIG_VGA_HEIGHT -#define VGA_DEFAULT_HEIGHT CONFIG_VGA_HEIGHT -#else -#define VGA_DEFAULT_HEIGHT 600 -#endif - -#ifdef CONFIG_VGA_DEPTH -#define VGA_DEFAULT_DEPTH CONFIG_VGA_DEPTH -#else -#define VGA_DEFAULT_DEPTH 8 -#endif - -#define VGA_DEFAULT_LINEBYTES (VGA_DEFAULT_WIDTH*((VGA_DEFAULT_DEPTH+7)/8)) - void vga_vbe_init(const char *path, unsigned long fb, uint32_t fb_size, unsigned long rom, uint32_t rom_size) { + phys_addr_t phys; phandle_t ph, chosen, aliases, options; char buf[6]; - int width = VGA_DEFAULT_WIDTH; - int height = VGA_DEFAULT_HEIGHT; - int depth = VGA_DEFAULT_DEPTH; - int linebytes = VGA_DEFAULT_LINEBYTES; - -#if defined(CONFIG_QEMU) && (defined(CONFIG_PPC) || defined(CONFIG_SPARC32) || defined(CONFIG_SPARC64)) - int w, h, d; - w = fw_cfg_read_i16(FW_CFG_ARCH_WIDTH); - h = fw_cfg_read_i16(FW_CFG_ARCH_HEIGHT); - d = fw_cfg_read_i16(FW_CFG_ARCH_DEPTH); - if (w && h && d) { - width = w; - height = h; - depth = d; - linebytes = (width * ((depth + 7) / 8)); - } + + phys = fb; + +#if defined(CONFIG_SPARC64) + /* Fix virtual address on SPARC64 somewhere else */ + fb = 0xfe000000ULL; #endif - vga_vbe_set_mode(width, height, depth); + setup_video(phys, fb); + vga_vbe_set_mode(VIDEO_DICT_VALUE(video.w), + VIDEO_DICT_VALUE(video.h), + VIDEO_DICT_VALUE(video.depth)); #if 0 ph = find_dev(path); @@ -154,10 +128,10 @@ ph = get_cur_dev(); #endif - set_int_property(ph, "width", width); - set_int_property(ph, "height", height); - set_int_property(ph, "depth", depth); - set_int_property(ph, "linebytes", linebytes); + set_int_property(ph, "width", VIDEO_DICT_VALUE(video.w)); + set_int_property(ph, "height", VIDEO_DICT_VALUE(video.h)); + set_int_property(ph, "depth", VIDEO_DICT_VALUE(video.depth)); + set_int_property(ph, "linebytes", VIDEO_DICT_VALUE(video.rb)); set_int_property(ph, "address", (u32)(fb & ~0x0000000F)); chosen = find_dev("/chosen"); @@ -169,9 +143,9 @@ set_property(aliases, "screen", path, strlen(path) + 1); options = find_dev("/options"); - snprintf(buf, sizeof(buf), "%d", width / FONT_WIDTH); + snprintf(buf, sizeof(buf), FMT_ucell, VIDEO_DICT_VALUE(video.w) / FONT_WIDTH); set_property(options, "screen-#columns", buf, strlen(buf) + 1); - snprintf(buf, sizeof(buf), "%d", height / FONT_HEIGHT); + snprintf(buf, sizeof(buf), FMT_ucell, VIDEO_DICT_VALUE(video.h) / FONT_HEIGHT); set_property(options, "screen-#rows", buf, strlen(buf) + 1); if (rom_size >= 8) { @@ -186,5 +160,5 @@ } } - init_video(fb, width, height, depth, linebytes); + init_video(); } Modified: trunk/openbios-devel/forth/device/display.fs ============================================================================== --- trunk/openbios-devel/forth/device/display.fs Sat Jul 27 12:14:41 2013 (r1181) +++ trunk/openbios-devel/forth/device/display.fs Sat Jul 27 12:14:44 2013 (r1182) @@ -72,7 +72,7 @@ defer fb-emit ( x -- ) -: depth-bytes ( bits -- bytes ) +: depth-bytes ( -- bytes ) depth-bits 1+ 8 / ; Modified: trunk/openbios-devel/include/arch/sparc32/io.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc32/io.h Sat Jul 27 12:14:41 2013 (r1181) +++ trunk/openbios-devel/include/arch/sparc32/io.h Sat Jul 27 12:14:44 2013 (r1182) @@ -191,4 +191,11 @@ extern void outsw(u32 reg, const void *addr, unsigned long count); #endif #endif + +#if defined(CONFIG_QEMU) +#define FW_CFG_ARCH_DEPTH (FW_CFG_ARCH_LOCAL + 0x00) +#define FW_CFG_ARCH_WIDTH (FW_CFG_ARCH_LOCAL + 0x01) +#define FW_CFG_ARCH_HEIGHT (FW_CFG_ARCH_LOCAL + 0x02) +#endif + #endif /* _ASM_IO_H */ Modified: trunk/openbios-devel/include/libopenbios/video.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:14:41 2013 (r1181) +++ trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:14:44 2013 (r1182) @@ -1,5 +1,26 @@ -void init_video(unsigned long fb, int width, int height, int depth, int rb); +#ifdef CONFIG_VGA_WIDTH +#define VGA_DEFAULT_WIDTH CONFIG_VGA_WIDTH +#else +#define VGA_DEFAULT_WIDTH 800 +#endif + +#ifdef CONFIG_VGA_HEIGHT +#define VGA_DEFAULT_HEIGHT CONFIG_VGA_HEIGHT +#else +#define VGA_DEFAULT_HEIGHT 600 +#endif + +#ifdef CONFIG_VGA_DEPTH +#define VGA_DEFAULT_DEPTH CONFIG_VGA_DEPTH +#else +#define VGA_DEFAULT_DEPTH 8 +#endif + +#define VGA_DEFAULT_LINEBYTES (VGA_DEFAULT_WIDTH*((VGA_DEFAULT_DEPTH+7)/8)) + +void setup_video(phys_addr_t phys, ucell virt); +void init_video(void); unsigned long video_get_color(int col_ind); void video_set_color(int ind, unsigned long color); int video_get_res(int *w, int *h); Modified: trunk/openbios-devel/libopenbios/video_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:41 2013 (r1181) +++ trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:44 2013 (r1182) @@ -22,6 +22,8 @@ #include "libopenbios/video.h" #include "packages/video.h" #include "drivers/vga.h" +#define NO_QEMU_PROTOS +#include "arch/common/fw_cfg.h" struct video_info video; @@ -221,21 +223,14 @@ } } -void -init_video( unsigned long fb, int width, int height, int depth, int rb ) +void setup_video(phys_addr_t phys, ucell virt) { - int i; -#if defined(CONFIG_OFMEM) && defined(CONFIG_DRIVER_PCI) - int size; -#endif - phandle_t ph=0, saved_ph=0; - - video.mphys = fb; - /* Make everything inside the video_info structure point to the values in the Forth dictionary. Hence everything is always in sync. */ + video.mphys = phys; + feval("['] qemu-video-addr cell+"); video.mvirt = cell2pointer(POP()); feval("['] qemu-video-width cell+"); @@ -249,32 +244,6 @@ feval("['] color-palette cell+"); video.pal = cell2pointer(POP()); - VIDEO_DICT_VALUE(video.mvirt) = (ucell)fb; - VIDEO_DICT_VALUE(video.w) = (ucell)width; - VIDEO_DICT_VALUE(video.h) = (ucell)height; - VIDEO_DICT_VALUE(video.depth) = (ucell)depth; - VIDEO_DICT_VALUE(video.rb) = (ucell)rb; - -#if defined(CONFIG_SPARC64) - /* Fix virtual address on SPARC64 somewhere else */ - VIDEO_DICT_VALUE(video.mvirt) = 0xfe000000ULL; -#endif - - saved_ph = get_cur_dev(); - while( (ph=dt_iterate_type(ph, "display")) ) { - set_int_property( ph, "width", VIDEO_DICT_VALUE(video.w) ); - set_int_property( ph, "height", VIDEO_DICT_VALUE(video.h) ); - set_int_property( ph, "depth", VIDEO_DICT_VALUE(video.depth) ); - set_int_property( ph, "linebytes", VIDEO_DICT_VALUE(video.rb) ); - set_int_property( ph, "address", VIDEO_DICT_VALUE(video.mvirt) ); - - activate_dev(ph); - - molvideo_init(); - } - video.has_video = 1; - activate_dev(saved_ph); - /* Set global variables ready for fb8-install */ PUSH( pointer2cell(video_mask_blit) ); fword("is-noname-cfunc"); @@ -294,6 +263,54 @@ PUSH(FONT_WIDTH); feval("to (romfont-width)"); + /* Initialise the structure */ + VIDEO_DICT_VALUE(video.mvirt) = virt; + VIDEO_DICT_VALUE(video.w) = VGA_DEFAULT_WIDTH; + VIDEO_DICT_VALUE(video.h) = VGA_DEFAULT_HEIGHT; + VIDEO_DICT_VALUE(video.depth) = VGA_DEFAULT_DEPTH; + VIDEO_DICT_VALUE(video.rb) = VGA_DEFAULT_LINEBYTES; + +#if defined(CONFIG_QEMU) && (defined(CONFIG_PPC) || defined(CONFIG_SPARC32) || defined(CONFIG_SPARC64)) + /* If running from QEMU, grab the parameters from the firmware interface */ + int w, h, d; + + w = fw_cfg_read_i16(FW_CFG_ARCH_WIDTH); + h = fw_cfg_read_i16(FW_CFG_ARCH_HEIGHT); + d = fw_cfg_read_i16(FW_CFG_ARCH_DEPTH); + if (w && h && d) { + VIDEO_DICT_VALUE(video.w) = w; + VIDEO_DICT_VALUE(video.h) = h; + VIDEO_DICT_VALUE(video.depth) = d; + VIDEO_DICT_VALUE(video.rb) = (w * ((d + 7) / 8)); + } +#endif +} + +void +init_video(void) +{ + int i; +#if defined(CONFIG_OFMEM) && defined(CONFIG_DRIVER_PCI) + int size; +#endif + phandle_t ph=0, saved_ph=0; + + saved_ph = get_cur_dev(); + while( (ph=dt_iterate_type(ph, "display")) ) { + video.has_video = 1; + + set_int_property( ph, "width", VIDEO_DICT_VALUE(video.w) ); + set_int_property( ph, "height", VIDEO_DICT_VALUE(video.h) ); + set_int_property( ph, "depth", VIDEO_DICT_VALUE(video.depth) ); + set_int_property( ph, "linebytes", VIDEO_DICT_VALUE(video.rb) ); + set_int_property( ph, "address", VIDEO_DICT_VALUE(video.mvirt) ); + + activate_dev(ph); + + molvideo_init(); + } + activate_dev(saved_ph); + #if defined(CONFIG_OFMEM) && defined(CONFIG_DRIVER_PCI) size = ((VIDEO_DICT_VALUE(video.h) * VIDEO_DICT_VALUE(video.rb)) + 0xfff) & ~0xfff;

1 0

[commit] r1181 - in trunk/openbios-devel: forth/device include/libopenbios libopenbios packages
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 12:14:41 2013 New Revision: 1181 URL: http://tracker.coreboot.org/trac/openbios/changeset/1181 Log: video_common.c: unify the video_info structure with Forth At the moment there are two sets of video parameters being used: those internal to Forth and those internal to C. Unify these two structures by redefining video_info to contain pointers to relevant values, and then changing init_video() to set the pointers to the relevant values in the Forth dictionary. 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/molvideo.c Modified: trunk/openbios-devel/forth/device/display.fs ============================================================================== --- trunk/openbios-devel/forth/device/display.fs Sat Jul 27 12:14:38 2013 (r1180) +++ trunk/openbios-devel/forth/device/display.fs Sat Jul 27 12:14:41 2013 (r1181) @@ -43,9 +43,10 @@ 0 value foreground-color 0 value background-color +create color-palette 100 cells allot 2 value font-spacing -0 value depth-bytes +0 value depth-bits 0 value line-bytes \ internal values read from QEMU firmware interface @@ -71,6 +72,10 @@ defer fb-emit ( x -- ) +: depth-bytes ( bits -- bytes ) + depth-bits 1+ 8 / +; + \ \ 5.3.6.2 Frame-buffer support routines \ Modified: trunk/openbios-devel/include/libopenbios/video.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:14:38 2013 (r1180) +++ trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:14:41 2013 (r1181) @@ -10,9 +10,11 @@ extern struct video_info { int has_video; - phys_addr_t mphys; - unsigned long mvirt; - int rb, w, h, depth; + volatile phys_addr_t mphys; + volatile ucell *mvirt; + volatile ucell *rb, *w, *h, *depth; - unsigned long *pal; /* 256 elements */ + volatile ucell *pal; /* 256 elements */ } video; + +#define VIDEO_DICT_VALUE(x) (*(ucell *)(x)) Modified: trunk/openbios-devel/libopenbios/video_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:38 2013 (r1180) +++ trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:41 2013 (r1181) @@ -31,12 +31,12 @@ unsigned long col; if( !video.has_video || col_ind < 0 || col_ind > 255 ) return 0; - if( video.depth == 8 ) + if( VIDEO_DICT_VALUE(video.depth) == 8 ) return col_ind; col = video.pal[col_ind]; - if( video.depth == 24 || video.depth == 32 ) + if( VIDEO_DICT_VALUE(video.depth) == 24 || VIDEO_DICT_VALUE(video.depth) == 32 ) return col; - if( video.depth == 15 ) + if( VIDEO_DICT_VALUE(video.depth) == 15 ) return ((col>>9) & 0x7c00) | ((col>>6) & 0x03e0) | ((col>>3) & 0x1f); return 0; } @@ -49,11 +49,11 @@ video.pal[ind] = color; #ifdef CONFIG_MOL - if( video.depth == 8 ) + if( VIDEO_DICT_VALUE(video.depth) == 8 ) OSI_SetColor( ind, color ); #elif defined(CONFIG_SPARC32) #if defined(CONFIG_DEBUG_CONSOLE_VIDEO) - if( video.depth == 8 ) { + if( VIDEO_DICT_VALUE(video.depth) == 8 ) { dac[0] = ind << 24; dac[1] = ((color >> 16) & 0xff) << 24; // Red dac[1] = ((color >> 8) & 0xff) << 24; // Green @@ -74,8 +74,8 @@ *w = *h = 0; return -1; } - *w = video.w; - *h = video.h; + *w = VIDEO_DICT_VALUE(video.w); + *h = VIDEO_DICT_VALUE(video.h); return 0; } @@ -97,8 +97,8 @@ fgcolor = video_get_color(fgcolor); bgcolor = video_get_color(bgcolor); - d = video.depth; - depthbytes = (video.depth + 1) >> 3; + d = VIDEO_DICT_VALUE(video.depth); + depthbytes = (d + 1) >> 3; dst = fbaddr; for( y = 0; y < height; y++) { @@ -125,7 +125,7 @@ mask++; } dst = rowdst; - dst += video.rb; + dst += VIDEO_DICT_VALUE(video.rb); } } @@ -146,13 +146,13 @@ fgcolor = video_get_color(fgcolor); if (!video.has_video || x < 0 || y < 0 || w <= 0 || h <= 0 || - x + w > video.w || y + h > video.h) + x + w > VIDEO_DICT_VALUE(video.w) || y + h > VIDEO_DICT_VALUE(video.h)) return; - pp = (char*)video.mvirt + video.rb * y; - for( ; h--; pp += video.rb ) { + pp = (char*)VIDEO_DICT_VALUE(video.mvirt) + VIDEO_DICT_VALUE(video.rb) * y; + for( ; h--; pp += *(video.rb) ) { int ww = w; - if( video.depth == 24 || video.depth == 32 ) { + if( VIDEO_DICT_VALUE(video.depth) == 24 || VIDEO_DICT_VALUE(video.depth) == 32 ) { unsigned long *p = (unsigned long*)pp + x; while( ww-- ) { if (*p == fgcolor) { @@ -161,7 +161,7 @@ *p++ = fgcolor; } } - } else if( video.depth == 16 || video.depth == 15 ) { + } else if( VIDEO_DICT_VALUE(video.depth) == 16 || VIDEO_DICT_VALUE(video.depth) == 15 ) { unsigned short *p = (unsigned short*)pp + x; while( ww-- ) { if (*p == (unsigned short)fgcolor) { @@ -198,17 +198,17 @@ unsigned long col = video_get_color(col_ind); if (!video.has_video || x < 0 || y < 0 || w <= 0 || h <= 0 || - x + w > video.w || y + h > video.h) + x + w > VIDEO_DICT_VALUE(video.w) || y + h > VIDEO_DICT_VALUE(video.h)) return; - pp = (char*)video.mvirt + video.rb * y; - for( ; h--; pp += video.rb ) { + pp = (char*)VIDEO_DICT_VALUE(video.mvirt) + VIDEO_DICT_VALUE(video.rb) * y; + for( ; h--; pp += VIDEO_DICT_VALUE(video.rb) ) { int ww = w; - if( video.depth == 24 || video.depth == 32 ) { + if( VIDEO_DICT_VALUE(video.depth) == 24 || VIDEO_DICT_VALUE(video.depth) == 32 ) { unsigned long *p = (unsigned long*)pp + x; while( ww-- ) *p++ = col; - } else if( video.depth == 16 || video.depth == 15 ) { + } else if( VIDEO_DICT_VALUE(video.depth) == 16 || VIDEO_DICT_VALUE(video.depth) == 15 ) { unsigned short *p = (unsigned short*)pp + x; while( ww-- ) *p++ = col; @@ -230,37 +230,51 @@ #endif phandle_t ph=0, saved_ph=0; - video.mphys = video.mvirt = fb; + video.mphys = fb; + + /* Make everything inside the video_info structure point to the + values in the Forth dictionary. Hence everything is always in + sync. */ + + feval("['] qemu-video-addr cell+"); + video.mvirt = cell2pointer(POP()); + feval("['] qemu-video-width cell+"); + video.w = cell2pointer(POP()); + feval("['] qemu-video-height cell+"); + video.h = cell2pointer(POP()); + feval("['] depth-bits cell+"); + video.depth = cell2pointer(POP()); + feval("['] line-bytes cell+"); + video.rb = cell2pointer(POP()); + feval("['] color-palette cell+"); + video.pal = cell2pointer(POP()); + + VIDEO_DICT_VALUE(video.mvirt) = (ucell)fb; + VIDEO_DICT_VALUE(video.w) = (ucell)width; + VIDEO_DICT_VALUE(video.h) = (ucell)height; + VIDEO_DICT_VALUE(video.depth) = (ucell)depth; + VIDEO_DICT_VALUE(video.rb) = (ucell)rb; #if defined(CONFIG_SPARC64) /* Fix virtual address on SPARC64 somewhere else */ - video.mvirt = 0xfe000000; + VIDEO_DICT_VALUE(video.mvirt) = 0xfe000000ULL; #endif - video.w = width; - video.h = height; - video.depth = depth; - video.rb = rb; - saved_ph = get_cur_dev(); while( (ph=dt_iterate_type(ph, "display")) ) { - set_int_property( ph, "width", video.w ); - set_int_property( ph, "height", video.h ); - set_int_property( ph, "depth", video.depth ); - set_int_property( ph, "linebytes", video.rb ); - set_int_property( ph, "address", video.mvirt ); + set_int_property( ph, "width", VIDEO_DICT_VALUE(video.w) ); + set_int_property( ph, "height", VIDEO_DICT_VALUE(video.h) ); + set_int_property( ph, "depth", VIDEO_DICT_VALUE(video.depth) ); + set_int_property( ph, "linebytes", VIDEO_DICT_VALUE(video.rb) ); + set_int_property( ph, "address", VIDEO_DICT_VALUE(video.mvirt) ); activate_dev(ph); molvideo_init(); } video.has_video = 1; - video.pal = malloc( 256 * sizeof(unsigned long) ); activate_dev(saved_ph); - PUSH(video.mvirt); - feval("to frame-buffer-adr"); - /* Set global variables ready for fb8-install */ PUSH( pointer2cell(video_mask_blit) ); fword("is-noname-cfunc"); @@ -272,29 +286,20 @@ fword("is-noname-cfunc"); feval("to fb8-invertrect"); - PUSH((video.depth + 1) >> 3); - feval("to depth-bytes"); - PUSH(video.rb); - feval("to line-bytes"); + /* Static information */ PUSH((ucell)fontdata); feval("to (romfont)"); PUSH(FONT_HEIGHT); feval("to (romfont-height)"); PUSH(FONT_WIDTH); feval("to (romfont-width)"); - PUSH(video.mvirt); - feval("to qemu-video-addr"); - PUSH(video.w); - feval("to qemu-video-width"); - PUSH(video.h); - feval("to qemu-video-height"); #if defined(CONFIG_OFMEM) && defined(CONFIG_DRIVER_PCI) - size = ((video.h * video.rb) + 0xfff) & ~0xfff; + size = ((VIDEO_DICT_VALUE(video.h) * VIDEO_DICT_VALUE(video.rb)) + 0xfff) & ~0xfff; ofmem_claim_phys( video.mphys, size, 0 ); - ofmem_claim_virt( video.mvirt, size, 0 ); - ofmem_map( video.mphys, video.mvirt, size, ofmem_arch_io_translation_mode(video.mphys) ); + ofmem_claim_virt( VIDEO_DICT_VALUE(video.mvirt), size, 0 ); + ofmem_map( video.mphys, VIDEO_DICT_VALUE(video.mvirt), size, ofmem_arch_io_translation_mode(video.mphys) ); #endif for( i=0; i<256; i++ ) Modified: trunk/openbios-devel/packages/molvideo.c ============================================================================== --- trunk/openbios-devel/packages/molvideo.c Sat Jul 27 12:14:38 2013 (r1180) +++ trunk/openbios-devel/packages/molvideo.c Sat Jul 27 12:14:41 2013 (r1181) @@ -35,7 +35,7 @@ molvideo_refresh_palette( void ) { #ifdef CONFIG_MOL - if( video.depth == 8 ) + if( VIDEO_DICT_VALUE(video.depth) == 8 ) OSI_RefreshPalette(); #endif } @@ -99,7 +99,7 @@ #endif /* only draw logo in 24-bit mode (for now) */ - if( video.depth < 15 ) + if( VIDEO_DICT_VALUE(video.depth) < 15 ) return; #ifdef CONFIG_MOL for( i=0; i<2; i++ ) { @@ -117,17 +117,17 @@ printk("bootlogo size error\n"); close_io( fd ); - dx = (video.w - width)/2; - dy = (video.h - height)/3; + dx = (VIDEO_DICT_VALUE(video.w) - width)/2; + dy = (VIDEO_DICT_VALUE(video.h) - height)/3; - pp = (char*)video.mvirt + dy * video.rb + dx * (video.depth >= 24 ? 4 : 2); + pp = (char*)VIDEO_DICT_VALUE(video.mvirt) + dy * VIDEO_DICT_VALUE(video.rb) + dx * (VIDEO_DICT_VALUE(video.depth) >= 24 ? 4 : 2); - for( y=0 ; y<height; y++, pp += video.rb ) { - if( video.depth >= 24 ) { + for( y=0 ; y<height; y++, pp += VIDEO_DICT_VALUE(video.rb) ) { + if( VIDEO_DICT_VALUE(video.depth) >= 24 ) { unsigned long *d = (unsigned long*)pp; for( x=0; x<width; x++, p+=3, d++ ) *d = ((int)p[0] << 16) | ((int)p[1] << 8) | p[2]; - } else if( video.depth == 15 ) { + } else if( VIDEO_DICT_VALUE(video.depth) == 15 ) { unsigned short *d = (unsigned short*)pp; for( x=0; x<width; x++, p+=3, d++ ) { int col = ((int)p[0] << 16) | ((int)p[1] << 8) | p[2];

1 0

[commit] r1180 - in trunk/openbios-devel: include/libopenbios libopenbios packages
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 12:14:38 2013 New Revision: 1180 URL: http://tracker.coreboot.org/trac/openbios/changeset/1180 Log: video_common.c: Move osi_fb_info_t struct contents directly into the video_info struct Despite the name, osi_fb_info_t doesn't seem to be used by MOL and is just a general holder for video parameters. So let's move everything into a single struct to make future dereferencing easier. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/include/libopenbios/video.h trunk/openbios-devel/libopenbios/video_common.c trunk/openbios-devel/packages/molvideo.c Modified: trunk/openbios-devel/include/libopenbios/video.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:14:34 2013 (r1179) +++ trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:14:38 2013 (r1180) @@ -7,14 +7,12 @@ void video_invert_rect(void); void video_fill_rect(void); -typedef struct osi_fb_info { - unsigned long mphys; +extern struct video_info { + int has_video; + + phys_addr_t mphys; unsigned long mvirt; int rb, w, h, depth; -} osi_fb_info_t; -extern struct video_info { - int has_video; - osi_fb_info_t fb; unsigned long *pal; /* 256 elements */ } video; Modified: trunk/openbios-devel/libopenbios/video_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:34 2013 (r1179) +++ trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:38 2013 (r1180) @@ -31,12 +31,12 @@ unsigned long col; if( !video.has_video || col_ind < 0 || col_ind > 255 ) return 0; - if( video.fb.depth == 8 ) + if( video.depth == 8 ) return col_ind; col = video.pal[col_ind]; - if( video.fb.depth == 24 || video.fb.depth == 32 ) + if( video.depth == 24 || video.depth == 32 ) return col; - if( video.fb.depth == 15 ) + if( video.depth == 15 ) return ((col>>9) & 0x7c00) | ((col>>6) & 0x03e0) | ((col>>3) & 0x1f); return 0; } @@ -49,11 +49,11 @@ video.pal[ind] = color; #ifdef CONFIG_MOL - if( video.fb.depth == 8 ) + if( video.depth == 8 ) OSI_SetColor( ind, color ); #elif defined(CONFIG_SPARC32) #if defined(CONFIG_DEBUG_CONSOLE_VIDEO) - if( video.fb.depth == 8 ) { + if( video.depth == 8 ) { dac[0] = ind << 24; dac[1] = ((color >> 16) & 0xff) << 24; // Red dac[1] = ((color >> 8) & 0xff) << 24; // Green @@ -74,8 +74,8 @@ *w = *h = 0; return -1; } - *w = video.fb.w; - *h = video.fb.h; + *w = video.w; + *h = video.h; return 0; } @@ -97,8 +97,8 @@ fgcolor = video_get_color(fgcolor); bgcolor = video_get_color(bgcolor); - d = video.fb.depth; - depthbytes = (video.fb.depth + 1) >> 3; + d = video.depth; + depthbytes = (video.depth + 1) >> 3; dst = fbaddr; for( y = 0; y < height; y++) { @@ -125,7 +125,7 @@ mask++; } dst = rowdst; - dst += video.fb.rb; + dst += video.rb; } } @@ -146,13 +146,13 @@ fgcolor = video_get_color(fgcolor); if (!video.has_video || x < 0 || y < 0 || w <= 0 || h <= 0 || - x + w > video.fb.w || y + h > video.fb.h) + x + w > video.w || y + h > video.h) return; - pp = (char*)video.fb.mvirt + video.fb.rb * y; - for( ; h--; pp += video.fb.rb ) { + pp = (char*)video.mvirt + video.rb * y; + for( ; h--; pp += video.rb ) { int ww = w; - if( video.fb.depth == 24 || video.fb.depth == 32 ) { + if( video.depth == 24 || video.depth == 32 ) { unsigned long *p = (unsigned long*)pp + x; while( ww-- ) { if (*p == fgcolor) { @@ -161,7 +161,7 @@ *p++ = fgcolor; } } - } else if( video.fb.depth == 16 || video.fb.depth == 15 ) { + } else if( video.depth == 16 || video.depth == 15 ) { unsigned short *p = (unsigned short*)pp + x; while( ww-- ) { if (*p == (unsigned short)fgcolor) { @@ -198,17 +198,17 @@ unsigned long col = video_get_color(col_ind); if (!video.has_video || x < 0 || y < 0 || w <= 0 || h <= 0 || - x + w > video.fb.w || y + h > video.fb.h) + x + w > video.w || y + h > video.h) return; - pp = (char*)video.fb.mvirt + video.fb.rb * y; - for( ; h--; pp += video.fb.rb ) { + pp = (char*)video.mvirt + video.rb * y; + for( ; h--; pp += video.rb ) { int ww = w; - if( video.fb.depth == 24 || video.fb.depth == 32 ) { + if( video.depth == 24 || video.depth == 32 ) { unsigned long *p = (unsigned long*)pp + x; while( ww-- ) *p++ = col; - } else if( video.fb.depth == 16 || video.fb.depth == 15 ) { + } else if( video.depth == 16 || video.depth == 15 ) { unsigned short *p = (unsigned short*)pp + x; while( ww-- ) *p++ = col; @@ -230,25 +230,25 @@ #endif phandle_t ph=0, saved_ph=0; - video.fb.mphys = video.fb.mvirt = fb; + video.mphys = video.mvirt = fb; #if defined(CONFIG_SPARC64) /* Fix virtual address on SPARC64 somewhere else */ - video.fb.mvirt = 0xfe000000; + video.mvirt = 0xfe000000; #endif - video.fb.w = width; - video.fb.h = height; - video.fb.depth = depth; - video.fb.rb = rb; + video.w = width; + video.h = height; + video.depth = depth; + video.rb = rb; saved_ph = get_cur_dev(); while( (ph=dt_iterate_type(ph, "display")) ) { - set_int_property( ph, "width", video.fb.w ); - set_int_property( ph, "height", video.fb.h ); - set_int_property( ph, "depth", video.fb.depth ); - set_int_property( ph, "linebytes", video.fb.rb ); - set_int_property( ph, "address", video.fb.mvirt ); + set_int_property( ph, "width", video.w ); + set_int_property( ph, "height", video.h ); + set_int_property( ph, "depth", video.depth ); + set_int_property( ph, "linebytes", video.rb ); + set_int_property( ph, "address", video.mvirt ); activate_dev(ph); @@ -258,7 +258,7 @@ video.pal = malloc( 256 * sizeof(unsigned long) ); activate_dev(saved_ph); - PUSH(video.fb.mvirt); + PUSH(video.mvirt); feval("to frame-buffer-adr"); /* Set global variables ready for fb8-install */ @@ -272,9 +272,9 @@ fword("is-noname-cfunc"); feval("to fb8-invertrect"); - PUSH((video.fb.depth + 1) >> 3); + PUSH((video.depth + 1) >> 3); feval("to depth-bytes"); - PUSH(video.fb.rb); + PUSH(video.rb); feval("to line-bytes"); PUSH((ucell)fontdata); feval("to (romfont)"); @@ -282,19 +282,19 @@ feval("to (romfont-height)"); PUSH(FONT_WIDTH); feval("to (romfont-width)"); - PUSH(video.fb.mvirt); + PUSH(video.mvirt); feval("to qemu-video-addr"); - PUSH(video.fb.w); + PUSH(video.w); feval("to qemu-video-width"); - PUSH(video.fb.h); + PUSH(video.h); feval("to qemu-video-height"); #if defined(CONFIG_OFMEM) && defined(CONFIG_DRIVER_PCI) - size = ((video.fb.h * video.fb.rb) + 0xfff) & ~0xfff; + size = ((video.h * video.rb) + 0xfff) & ~0xfff; - ofmem_claim_phys( video.fb.mphys, size, 0 ); - ofmem_claim_virt( video.fb.mvirt, size, 0 ); - ofmem_map( video.fb.mphys, video.fb.mvirt, size, ofmem_arch_io_translation_mode(video.fb.mphys) ); + ofmem_claim_phys( video.mphys, size, 0 ); + ofmem_claim_virt( video.mvirt, size, 0 ); + ofmem_map( video.mphys, video.mvirt, size, ofmem_arch_io_translation_mode(video.mphys) ); #endif for( i=0; i<256; i++ ) Modified: trunk/openbios-devel/packages/molvideo.c ============================================================================== --- trunk/openbios-devel/packages/molvideo.c Sat Jul 27 12:14:34 2013 (r1179) +++ trunk/openbios-devel/packages/molvideo.c Sat Jul 27 12:14:38 2013 (r1180) @@ -35,7 +35,7 @@ molvideo_refresh_palette( void ) { #ifdef CONFIG_MOL - if( video.fb.depth == 8 ) + if( video.depth == 8 ) OSI_RefreshPalette(); #endif } @@ -99,7 +99,7 @@ #endif /* only draw logo in 24-bit mode (for now) */ - if( video.fb.depth < 15 ) + if( video.depth < 15 ) return; #ifdef CONFIG_MOL for( i=0; i<2; i++ ) { @@ -117,17 +117,17 @@ printk("bootlogo size error\n"); close_io( fd ); - dx = (video.fb.w - width)/2; - dy = (video.fb.h - height)/3; + dx = (video.w - width)/2; + dy = (video.h - height)/3; - pp = (char*)video.fb.mvirt + dy * video.fb.rb + dx * (video.fb.depth >= 24 ? 4 : 2); + pp = (char*)video.mvirt + dy * video.rb + dx * (video.depth >= 24 ? 4 : 2); - for( y=0 ; y<height; y++, pp += video.fb.rb ) { - if( video.fb.depth >= 24 ) { + for( y=0 ; y<height; y++, pp += video.rb ) { + if( video.depth >= 24 ) { unsigned long *d = (unsigned long*)pp; for( x=0; x<width; x++, p+=3, d++ ) *d = ((int)p[0] << 16) | ((int)p[1] << 8) | p[2]; - } else if( video.fb.depth == 15 ) { + } else if( video.depth == 15 ) { unsigned short *d = (unsigned short*)pp; for( x=0; x<width; x++, p+=3, d++ ) { int col = ((int)p[0] << 16) | ((int)p[1] << 8) | p[2];

1 0