OpenBIOS July 2013

openbios@openbios.org

13 participants
38 discussions

[commit] r1179 - 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:34 2013 New Revision: 1179 URL: http://tracker.coreboot.org/trac/openbios/changeset/1179 Log: video_common.c: rename get_color() and set_color() functions These are now called video_get_color() and video_set_color() respectively. 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:32 2013 (r1178) +++ trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:14:34 2013 (r1179) @@ -1,7 +1,7 @@ void init_video(unsigned long fb, int width, int height, int depth, int rb); -unsigned long get_color(int col_ind); -void set_color(int ind, unsigned long color); +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); Modified: trunk/openbios-devel/libopenbios/video_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:32 2013 (r1178) +++ trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:34 2013 (r1179) @@ -26,7 +26,7 @@ struct video_info video; unsigned long -get_color( int col_ind ) +video_get_color( int col_ind ) { unsigned long col; if( !video.has_video || col_ind < 0 || col_ind > 255 ) @@ -42,7 +42,7 @@ } void -set_color( int ind, unsigned long color ) +video_set_color( int ind, unsigned long color ) { if( !video.has_video || ind < 0 || ind > 255 ) return; @@ -95,8 +95,8 @@ unsigned char *dst, *rowdst; int x, y, m, b, d, depthbytes; - fgcolor = get_color(fgcolor); - bgcolor = get_color(bgcolor); + fgcolor = video_get_color(fgcolor); + bgcolor = video_get_color(bgcolor); d = video.fb.depth; depthbytes = (video.fb.depth + 1) >> 3; @@ -142,8 +142,8 @@ int x = POP(); char *pp; - bgcolor = get_color(bgcolor); - fgcolor = get_color(fgcolor); + bgcolor = video_get_color(bgcolor); + 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) @@ -195,7 +195,7 @@ int col_ind = POP(); char *pp; - unsigned long col = get_color(col_ind); + 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) @@ -298,7 +298,7 @@ #endif for( i=0; i<256; i++ ) - set_color( i, i * 0x010101 ); + video_set_color( i, i * 0x010101 ); - set_color( 254, 0xffffcc ); + video_set_color( 254, 0xffffcc ); } Modified: trunk/openbios-devel/packages/molvideo.c ============================================================================== --- trunk/openbios-devel/packages/molvideo.c Sat Jul 27 12:14:32 2013 (r1178) +++ trunk/openbios-devel/packages/molvideo.c Sat Jul 27 12:14:34 2013 (r1179) @@ -61,7 +61,7 @@ for( i=0; i<count; i++, p+=3 ) { unsigned long col = (p[0] << 16) | (p[1] << 8) | p[2]; - set_color( i + start, col ); + video_set_color( i + start, col ); } molvideo_refresh_palette(); } @@ -76,7 +76,7 @@ int r = POP(); unsigned long col = ((r << 16) & 0xff0000) | ((g << 8) & 0x00ff00) | (b & 0xff); /* printk("color!: %08lx %08lx %08lx %08lx\n", r, g, b, index ); */ - set_color( index, col ); + video_set_color( index, col ); molvideo_refresh_palette(); }

1 0

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

27 Jul '13

Author: mcayland Date: Sat Jul 27 12:14:32 2013 New Revision: 1178 URL: http://tracker.coreboot.org/trac/openbios/changeset/1178 Log: video_common.c: remove video_scroll1() and draw_pixel() as they are no longer needed 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 Modified: trunk/openbios-devel/include/libopenbios/video.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:14:29 2013 (r1177) +++ trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:14:32 2013 (r1178) @@ -3,8 +3,6 @@ unsigned long get_color(int col_ind); void set_color(int ind, unsigned long color); int video_get_res(int *w, int *h); -void draw_pixel(int x, int y, int colind); -void video_scroll(int height); 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:29 2013 (r1177) +++ trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:32 2013 (r1178) @@ -184,47 +184,6 @@ } } -void -draw_pixel( int x, int y, int colind ) -{ - char *p = (char*)video.fb.mvirt + video.fb.rb * y; - int color, d = video.fb.depth; - - if( x < 0 || y < 0 || x >= video.fb.w || y >=video.fb.h ) - return; - color = get_color( colind ); - - if( d >= 24 ) - *((unsigned long*)p + x) = color; - else if( d >= 15 ) - *((short*)p + x) = color; - else - *(p + x) = color; -} - -void -video_scroll( int height ) -{ - int i, offs, size, *dest, *src; - - if (height <= 0 || height >= video.fb.h) { - return; - } - offs = video.fb.rb * height; - size = (video.fb.h * video.fb.rb - offs)/16; - dest = (int*)video.fb.mvirt; - src = (int*)(video.fb.mvirt + offs); - - for( i=0; i<size; i++ ) { - dest[0] = src[0]; - dest[1] = src[1]; - dest[2] = src[2]; - dest[3] = src[3]; - dest += 4; - src += 4; - } -} - /* ( color_ind x y width height -- ) (?) */ void video_fill_rect(void)

1 0

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

27 Jul '13

Author: mcayland Date: Sat Jul 27 12:14:29 2013 New Revision: 1177 URL: http://tracker.coreboot.org/trac/openbios/changeset/1177 Log: video_common.c: now fill_rect() is no longer called directly, merge it into the video_fill_rect() 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 Modified: trunk/openbios-devel/include/libopenbios/video.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:14:26 2013 (r1176) +++ trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:14:29 2013 (r1177) @@ -5,7 +5,6 @@ int video_get_res(int *w, int *h); void draw_pixel(int x, int y, int colind); void video_scroll(int height); -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); Modified: trunk/openbios-devel/libopenbios/video_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:26 2013 (r1176) +++ trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:29 2013 (r1177) @@ -225,9 +225,16 @@ } } +/* ( color_ind x y width height -- ) (?) */ void -fill_rect( int col_ind, int x, int y, int w, int h ) +video_fill_rect(void) { + int h = POP(); + int w = POP(); + int y = POP(); + int x = POP(); + int col_ind = POP(); + char *pp; unsigned long col = get_color(col_ind); @@ -255,19 +262,6 @@ } } -/* ( 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 ) {

1 0

[commit] r1176 - 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:26 2013 New Revision: 1176 URL: http://tracker.coreboot.org/trac/openbios/changeset/1176 Log: video_common.c: move startup_splash() and refresh_palette() to packages/molvideo.c These routines are MOL-specific and currently not required anywhere else. 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:22 2013 (r1175) +++ trunk/openbios-devel/forth/device/display.fs Sat Jul 27 12:14:26 2013 (r1176) @@ -375,4 +375,10 @@ 0 to foreground-color fb8-erase-screen + + \ If we have a startup splash then display it + [IFDEF] CONFIG_MOL + startup-splash 2000 ms + fb8-erase-screen + [THEN] ; Modified: trunk/openbios-devel/include/libopenbios/video.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:14:22 2013 (r1175) +++ trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:14:26 2013 (r1176) @@ -2,7 +2,6 @@ void init_video(unsigned long fb, int width, int height, int depth, int rb); unsigned long get_color(int col_ind); void set_color(int ind, unsigned long color); -void refresh_palette(void); int video_get_res(int *w, int *h); void draw_pixel(int x, int y, int colind); void video_scroll(int height); Modified: trunk/openbios-devel/libopenbios/video_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:22 2013 (r1175) +++ trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:26 2013 (r1176) @@ -67,61 +67,6 @@ #endif } -static void -startup_splash( void ) -{ -#ifdef CONFIG_MOL - int fd, s, i, y, x, dx, dy; - int width, height; - char *pp, *p; - char buf[64]; -#endif - - /* only draw logo in 24-bit mode (for now) */ - if( video.fb.depth < 15 ) - return; -#ifdef CONFIG_MOL - for( i=0; i<2; i++ ) { - if( !BootHGetStrResInd("bootlogo", buf, sizeof(buf), 0, i) ) - return; - *(!i ? &width : &height) = atol(buf); - } - - if( (s=width * height * 3) > 0x20000 ) - return; - - if( (fd=open_io("pseudo:,bootlogo")) >= 0 ) { - p = malloc( s ); - if( read_io(fd, p, s) != s ) - printk("bootlogo size error\n"); - close_io( fd ); - - dx = (video.fb.w - width)/2; - dy = (video.fb.h - height)/3; - - pp = (char*)video.fb.mvirt + dy * video.fb.rb + dx * (video.fb.depth >= 24 ? 4 : 2); - - for( y=0 ; y<height; y++, pp += video.fb.rb ) { - if( video.fb.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 ) { - 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]; - *d = ((col>>9) & 0x7c00) | ((col>>6) & 0x03e0) | ((col>>3) & 0x1f); - } - } - } - free( p ); - } -#else - /* No bootlogo support yet on other platforms */ - return; -#endif -} - int video_get_res( int *w, int *h ) { @@ -310,15 +255,6 @@ } } -void -refresh_palette( void ) -{ -#ifdef CONFIG_MOL - if( video.fb.depth == 8 ) - OSI_RefreshPalette(); -#endif -} - /* ( color_ind x y width height -- ) (?) */ void video_fill_rect(void) @@ -412,7 +348,4 @@ set_color( i, i * 0x010101 ); set_color( 254, 0xffffcc ); - - refresh_palette(); - startup_splash(); } Modified: trunk/openbios-devel/packages/molvideo.c ============================================================================== --- trunk/openbios-devel/packages/molvideo.c Sat Jul 27 12:14:22 2013 (r1175) +++ trunk/openbios-devel/packages/molvideo.c Sat Jul 27 12:14:26 2013 (r1176) @@ -31,6 +31,15 @@ DECLARE_NODE( video, 0, 0, "Tdisplay" ); +static void +molvideo_refresh_palette( void ) +{ +#ifdef CONFIG_MOL + if( video.fb.depth == 8 ) + OSI_RefreshPalette(); +#endif +} + /* ( -- width height ) (?) */ static void molvideo_dimensions( void ) @@ -54,7 +63,7 @@ unsigned long col = (p[0] << 16) | (p[1] << 8) | p[2]; set_color( i + start, col ); } - refresh_palette(); + molvideo_refresh_palette(); } /* ( r g b index -- ) */ @@ -68,7 +77,7 @@ unsigned long col = ((r << 16) & 0xff0000) | ((g << 8) & 0x00ff00) | (b & 0xff); /* printk("color!: %08lx %08lx %08lx %08lx\n", r, g, b, index ); */ set_color( index, col ); - refresh_palette(); + molvideo_refresh_palette(); } /* ( color_ind x y width height -- ) (?) */ @@ -78,11 +87,69 @@ video_fill_rect(); } +/* ( -- ) - really should be reworked as draw-logo */ +static void +molvideo_startup_splash( void ) +{ +#ifdef CONFIG_MOL + int fd, s, i, y, x, dx, dy; + int width, height; + char *pp, *p; + char buf[64]; +#endif + + /* only draw logo in 24-bit mode (for now) */ + if( video.fb.depth < 15 ) + return; +#ifdef CONFIG_MOL + for( i=0; i<2; i++ ) { + if( !BootHGetStrResInd("bootlogo", buf, sizeof(buf), 0, i) ) + return; + *(!i ? &width : &height) = atol(buf); + } + + if( (s=width * height * 3) > 0x20000 ) + return; + + if( (fd=open_io("pseudo:,bootlogo")) >= 0 ) { + p = malloc( s ); + if( read_io(fd, p, s) != s ) + printk("bootlogo size error\n"); + close_io( fd ); + + dx = (video.fb.w - width)/2; + dy = (video.fb.h - height)/3; + + pp = (char*)video.fb.mvirt + dy * video.fb.rb + dx * (video.fb.depth >= 24 ? 4 : 2); + + for( y=0 ; y<height; y++, pp += video.fb.rb ) { + if( video.fb.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 ) { + 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]; + *d = ((col>>9) & 0x7c00) | ((col>>6) & 0x03e0) | ((col>>3) & 0x1f); + } + } + } + free( p ); + } +#else + /* No bootlogo support yet on other platforms */ + return; +#endif +} + + NODE_METHODS( video ) = { {"dimensions", molvideo_dimensions }, {"set-colors", molvideo_set_colors }, {"fill-rectangle", molvideo_fill_rect }, {"color!", molvideo_color_bang }, + {"startup-splash", molvideo_startup_splash }, };

1 0

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

27 Jul '13

Author: mcayland Date: Sat Jul 27 12:14:22 2013 New Revision: 1175 URL: http://tracker.coreboot.org/trac/openbios/changeset/1175 Log: video_common.c: remove manual screen clear since fb8-erase-screen does this now 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:19 2013 (r1174) +++ trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:22 2013 (r1175) @@ -412,7 +412,6 @@ set_color( i, i * 0x010101 ); set_color( 254, 0xffffcc ); - fill_rect( 254, 0, 0, video.fb.w, video.fb.h ); refresh_palette(); startup_splash();

1 0

[commit] r1174 - trunk/openbios-devel/packages
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 12:14:19 2013 New Revision: 1174 URL: http://tracker.coreboot.org/trac/openbios/changeset/1174 Log: packages: rename video.c to molvideo.c ready for MOL-specific video routines While we are here, remove the INSTALL_OPEN flag since this is now handled by is-install (removing the "open is not unique" warning on the serial console during startup). Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Added: trunk/openbios-devel/packages/molvideo.c - copied, changed from r1173, trunk/openbios-devel/packages/video.c Deleted: trunk/openbios-devel/packages/video.c Modified: trunk/openbios-devel/packages/build.xml Modified: trunk/openbios-devel/packages/build.xml ============================================================================== --- trunk/openbios-devel/packages/build.xml Sat Jul 27 12:14:17 2013 (r1173) +++ trunk/openbios-devel/packages/build.xml Sat Jul 27 12:14:19 2013 (r1174) @@ -11,7 +11,7 @@ <object source="nvram.c"/> <object source="pc-parts.c" condition="PC_PARTS"/> <object source="sun-parts.c" condition="SUN_PARTS"/> - <object source="video.c"/> + <object source="molvideo.c"/> <object source="xcoff-loader.c" condition="LOADER_XCOFF"/> </library> Copied and modified: trunk/openbios-devel/packages/molvideo.c (from r1173, trunk/openbios-devel/packages/video.c) ============================================================================== --- trunk/openbios-devel/packages/video.c Sat Jul 27 12:14:17 2013 (r1173, copy source) +++ trunk/openbios-devel/packages/molvideo.c Sat Jul 27 12:14:19 2013 (r1174) @@ -29,11 +29,11 @@ /* OF methods */ /************************************************************************/ -DECLARE_NODE( video, INSTALL_OPEN, 0, "Tdisplay" ); +DECLARE_NODE( video, 0, 0, "Tdisplay" ); /* ( -- width height ) (?) */ static void -video_dimensions( void ) +molvideo_dimensions( void ) { int w, h; (void) video_get_res( &w, &h ); @@ -43,7 +43,7 @@ /* ( table start count -- ) (?) */ static void -video_set_colors( void ) +molvideo_set_colors( void ) { int count = POP(); int start = POP(); @@ -59,7 +59,7 @@ /* ( r g b index -- ) */ static void -video_color_bang( void ) +molvideo_color_bang( void ) { int index = POP(); int b = POP(); @@ -71,11 +71,18 @@ refresh_palette(); } +/* ( color_ind x y width height -- ) (?) */ +static void +molvideo_fill_rect ( void ) +{ + video_fill_rect(); +} + NODE_METHODS( video ) = { - {"dimensions", video_dimensions }, - {"set-colors", video_set_colors }, - {"fill-rectangle", video_fill_rect }, - {"color!", video_color_bang }, + {"dimensions", molvideo_dimensions }, + {"set-colors", molvideo_set_colors }, + {"fill-rectangle", molvideo_fill_rect }, + {"color!", molvideo_color_bang }, };

1 0

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

27 Jul '13

Author: mcayland Date: Sat Jul 27 12:14:17 2013 New Revision: 1173 URL: http://tracker.coreboot.org/trac/openbios/changeset/1173 Log: libopenbios: remove the C terminal emulator file console_common.c With the advent of the Forth terminal it is no longer required. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Deleted: trunk/openbios-devel/libopenbios/console_common.c Modified: trunk/openbios-devel/arch/sparc32/console.c trunk/openbios-devel/libopenbios/build.xml Modified: trunk/openbios-devel/arch/sparc32/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/console.c Sat Jul 27 12:14:14 2013 (r1172) +++ trunk/openbios-devel/arch/sparc32/console.c Sat Jul 27 12:14:17 2013 (r1173) @@ -39,8 +39,6 @@ { vmem = (unsigned char *)ofmem_map_io(base + VMEM_BASE, VMEM_SIZE); dac = (uint32_t *)ofmem_map_io(base + DAC_BASE, DAC_SIZE); - - console_init(); } #endif Modified: trunk/openbios-devel/libopenbios/build.xml ============================================================================== --- trunk/openbios-devel/libopenbios/build.xml Sat Jul 27 12:14:14 2013 (r1172) +++ trunk/openbios-devel/libopenbios/build.xml Sat Jul 27 12:14:17 2013 (r1173) @@ -6,7 +6,6 @@ <object source="bootcode_load.c" condition="LOADER_BOOTCODE"/> <object source="bootinfo_load.c" condition="LOADER_BOOTINFO"/> <object source="client.c"/> - <object source="console_common.c"/> <object source="elf_info.c" /> <object source="elf_load.c" condition="LOADER_ELF"/> <object source="font_8x8.c" condition="FONT_8X8"/>

1 0

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

27 Jul '13

Author: mcayland Date: Sat Jul 27 12:14:14 2013 New Revision: 1172 URL: http://tracker.coreboot.org/trac/openbios/changeset/1172 Log: video_common.c: remove video_open() and video_write() methods These were only included to allow switching between the C terminal and the Forth terminal during development. 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 Thu Jul 11 18:49:27 2013 (r1171) +++ trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:14 2013 (r1172) @@ -319,26 +319,6 @@ #endif } -static void -video_open(void) -{ - PUSH(-1); -} - -/* ( addr len -- actual ) */ -static void -video_write(void) -{ - char *addr; - int len; - - len = POP(); - addr = (char *)cell2pointer(POP()); - - console_draw_fstr(addr, len); - PUSH(len); -} - /* ( color_ind x y width height -- ) (?) */ void video_fill_rect(void) @@ -383,14 +363,6 @@ activate_dev(ph); - if (!find_package_method("open", ph)) { - bind_func("open", video_open); - } - - if (!find_package_method("write", ph)) { - bind_func("write", video_write); - } - molvideo_init(); } video.has_video = 1;

1 0

Re: [OpenBIOS] Secure BIOS for voting?
by SAVIOCvs＠aol.com 23 Jul '13

23 Jul '13

The three responses I've seen so far were all negative, but also puzzling to me. I'll try to address the key points in the response that is copied below, as well as those in the other two responses. (1) Why floppies? -- (a) Because they are limited in storage, and non-electronic. The smaller the memory, the harder it is to hide something malicious in it, and the easier to check it. (b) Because they are inexpensive. Any entity wishing to verify voting results needs one memory device for every voting machine. (2) Aren't floppies unreliable? -- No. Since I started keeping track of my public voting demos in 2002, I have used 992 diskettes without a single failure between starting voting and archiving results. (That's not 992 different new diskettes; each is used over and over again unless a check done at startup reveals possible unreliability.) (3) Aren't floppy drives obsolete? -- No. USB-connected floppy drives are readily available for about $15, and computers can boot from them. (4) BIOS averages 8 MB? -- WOW! I still don't know how big OpenBIOS is, but I was hoping for something a bit closer to the 8 KB of the original IBM PC. The capabilities of a 386 computer are sufficient for my voting system. Is OpenBIOS really so huge? Does a BIOS have to be? (5) Hypervisor? Virtual machine? Address remapping? Infectious native BIOS? -- If a modern computer has no hard drive connected, what happens when it boots from a floppy? There is a boot sector on the diskette (which is verified by hash code); doesn't that control what happens next? Why can't the floppy contents take control of the computer? Obviously, I'm no BIOS expert. I'd appreciate recommendations of good texts or tutorials to bring me up to speed. Chuck Gaston In a message dated 7/19/2013 9:04:29 A.M. Eastern Daylight Time, Nick.Couchman(a)seakr.com writes: >>> On 2013/07/19 at 06:01, <SAVIOCvs(a)aol.com> wrote: > I developed a voting system (see _www.SAVIOC.com_ (http://www.SAVIOC.com) ) > that uses ordinary old PCs, yet is more transparent and trustworthy than > anything else in use today. All software, including the operating system > (FreeDOS) boots from a floppy that can be verified by hash code. The PC > never uses the hard drive, and doesn't even need one. Trustworthiness > comes > from people with different interests being able to prevent each other from > doing anything fraudulent. I think the only significant potential > vulnerability is that someone with physical access to the machines could > install a > malicious BIOS. Learning about the OpenBIOS project gave me hope of > overcoming that vulnerability. > > (1) Is my hope justified? Can a PC be booted from a floppy that > completely replaces the native BIOS in RAM, and then loads FreeDOS? (Can > the > possibility of a malicious BIOS be made a non-issue?) > > If all answers are YES, then the remaining very basic questions become > important. Perhaps this is a digression, but why a floppy? If you're using old hardware, that's fine, but at some point you probably want to use modern hardware, and I don't know of a modern hardware system that comes with a floppy drive, anymore. Furthermore, my many years of experience with floppy disks tells me that they are unreliable - very prone to failures of a variety of types (dirty heads, physical damage to the medium, etc.). Many of these types of failures mean mis-reads, which means bad checksums and failures in the security model you're trying to implement. If you're looking for something compatible with very old hardware - hardware that does not support booting from USB flash drives - I'd recommend finding some older IDE flash chips (disk on chip) that you can use, instead. These are probably pretty cheap, now, and should give you the capacity and reliability that you won't get with floppy disks. > > (2) Roughly how much space on the floppy would be required? You can build the OpenBIOS tree and see how large the binary is. I don't remember off the top of my head, so I can't tell you. Many modern BIOS implementations are several MB - I believe 8MB is the average BIOS size (not openBIOS, just BIOS in general), with some as large as 12MB. This presents another problem when using floppies...you'd need multiple ones. > (3) What downloads would I need? OpenBIOS AND OpenFirmware AND OpenBOOT? > Anything else? Probably just OpenBIOS. > (4) How are they downloaded? > http://www.openfirmware.info/index.php/Downloads displays a page > beginning, "This page has been deleted." All other links that imply the > possibility > of downloading reach a page headlined, "The page cannot be displayed". > SVN check-out of the current source tree and build. Decently modern versions are also included with Qemu, IIRC. -Nick -------- This e-mail may contain confidential and privileged material for the sole use of the intended recipient. If this email is not intended for you, or you are not responsible for the delivery of this message to the intended recipient, please note that this message may contain SEAKR Engineering (SEAKR) Privileged/Proprietary Information. In such a case, you are strictly prohibited from downloading, photocopying, distributing or otherwise using this message, its contents or attachments in any way. If you have received this message in error, please notify us immediately by replying to this e-mail and delete the message from your mailbox. Information contained in this message that does not relate to the business of SEAKR is neither endorsed by nor attributable to SEAKR. -- OpenBIOS http://openbios.org/ Mailinglist: http://lists.openbios.org/mailman/listinfo Free your System - May the Forth be with you

4 12

Using the command key
by Programmingkid 20 Jul '13

20 Jul '13

Over half a year ago there was talk about making the command key work on QEMU. I have finally made a patch that allows users of QEMU on Mac OS X be able to do this. Just apply the patch to QEMU to make the command key work. You set the command key by using this option: -command-key 55. This will make the command key work in QEMU. To quit QEMU, type ALT - Q. Let me know if you like it. --- ui/cocoa.m | 123 +++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 110 insertions(+), 13 deletions(-) diff --git a/ui/cocoa.m b/ui/cocoa.m index be49179..4884ccf 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -70,6 +70,7 @@ static DisplayChangeListener *dcl; int gArgc; char **gArgv; +bool substitutingForCommandKey = false; // keymap conversion int keymap[] = @@ -129,8 +130,8 @@ int keymap[] = 14, // 51 0x33 0x0e BKSP QZ_BACKSPACE 0, // 52 0x34 Undefined 1, // 53 0x35 0x01 ESC QZ_ESCAPE - 0, // 54 0x36 QZ_RMETA - 0, // 55 0x37 QZ_LMETA + 220, // 54 0x36 QZ_RMETA + 219, // 55 0x37 QZ_LMETA 42, // 56 0x38 0x2a L SHFT QZ_LSHIFT 58, // 57 0x39 0x3a CAPS QZ_CAPSLOCK 56, // 58 0x3A 0x38 L ALT QZ_LALT @@ -249,6 +250,72 @@ static int cocoa_keycode_to_qemu(int keycode) } +// Used to map the guest OS's command key to a key on the host keyboard. +// Uses the -command-key option. +static void handleCommandKeyOption(int * argc, char * argv[]) +{ + bool foundOption = false; + int newCommandKeyButtonValue, i; + + #define BUFFER_SIZE 10 + #define LEFT_COMMAND_KEY 0x37 + #define RIGHT_COMMAND_KEY 0x36 + #define GUEST_COMMAND_KEY 219 + + char keyValueString[BUFFER_SIZE]; + + for(i = 0; i < *argc; i++) { + if(strcmp(argv[i], "-command-key") == 0) { + foundOption = true; + break; + } + } + + // if the -command-key option is found + if(foundOption == true) + { + snprintf(keyValueString, BUFFER_SIZE, "%s", argv[i+1]); + if(strlen(keyValueString) == 0) { + printf("Usage: -command-key <host keyboard key value>\n"); + printf("This page will help: http://boredzo.org/blog/wp-content/uploads/2007/05/imtx-virtual-keycodes.pn…"); + exit(-1000); + } + + // if using hexadecimal notation (e.g. 0x37) + if(keyValueString[0] == '0' && toupper(keyValueString[1]) == 'X') { + sscanf(keyValueString, "%x", &newCommandKeyButtonValue); + } + + // for decimal notation + else { + newCommandKeyButtonValue = atoi(keyValueString); + } + + //in case the key specified is a negative value + if(newCommandKeyButtonValue < 0) { + printf("\aCan't use a negative value for the command key!\n"); + exit(-1001); + } + + // if the guest OS command key is set to the host keyboard's left or right command key + if(newCommandKeyButtonValue == LEFT_COMMAND_KEY || newCommandKeyButtonValue == RIGHT_COMMAND_KEY) { + substitutingForCommandKey = true; + printf("\nNote: since you are using the host command key, the ALT key can be used to send QEMU commands.\n"); + printf("Example: use ALT-q to quit QEMU.\n\n"); + } + + // do the mapping + keymap[newCommandKeyButtonValue] = GUEST_COMMAND_KEY; + + // Remove -command-key from the argument list. + // QEMU will complain if we don't. + for(int x = i; x < *argc - 2; x=x+2) { + argv[x] = argv[x+2]; + argv[x+1] = argv[x+3]; + } + *argc = *argc - 2; + } +} /* ------------------------------------------------------ @@ -491,20 +558,27 @@ QemuCocoaView *cocoaView; int keycode; NSPoint p = [event locationInWindow]; + // The key used to send QEMU commands (e.g. Quit, Full Screen). + // Change this if you don't like using the ALT key. + // Possible values: NSShiftKeyMask, NSControlKeyMask, NSFunctionKeyMask, NSAlternateKeyMask + const int substituteKeyMask = NSAlternateKeyMask; + switch ([event type]) { case NSFlagsChanged: - keycode = cocoa_keycode_to_qemu([event keyCode]); + keycode = cocoa_keycode_to_qemu([event keyCode]); if (keycode) { if (keycode == 58 || keycode == 69) { // emulate caps lock and num lock keydown and keyup kbd_put_keycode(keycode); kbd_put_keycode(keycode | 0x80); } else if (qemu_console_is_graphic(NULL)) { - if (keycode & 0x80) - kbd_put_keycode(0xe0); - if (modifiers_state[keycode] == 0) { // keydown + if (keycode & 0x80) // if keycode >= 0x80, for those keycodes that need a 0xe0 sent first + { + kbd_put_keycode(0xe0); + } + if (modifiers_state[keycode] == 0) { // keydown kbd_put_keycode(keycode & 0x7f); modifiers_state[keycode] = 1; - } else { // keyup + } else { // keyup kbd_put_keycode(keycode | 0x80); modifiers_state[keycode] = 0; } @@ -516,17 +590,37 @@ QemuCocoaView *cocoaView; [self ungrabMouse]; } break; - case NSKeyDown: + case NSKeyDown: + // if substituting for the host command key and the substitute key is being held down - have QEMU handle it + if((substitutingForCommandKey == true) && ([event modifierFlags] & substituteKeyMask)) { + // recreate the event with the command key as the modifier + int modifiers = [event modifierFlags]; + modifiers = modifiers | NSCommandKeyMask; // set the command key + modifiers = modifiers ^ substituteKeyMask; // unset the substitute key + + event = [NSEvent keyEventWithType: [event type] location: [event locationInWindow] modifierFlags: modifiers + timestamp: [event timestamp] windowNumber: [event windowNumber] context: [event context] characters: [event characters] + charactersIgnoringModifiers: [event charactersIgnoringModifiers] isARepeat: [event isARepeat] keyCode: [event keyCode] ]; + [NSApp sendEvent:event]; + return; + } - // forward command Key Combos - if ([event modifierFlags] & NSCommandKeyMask) { + // if the command key is held down and we want QEMU to handle the event - not the guest OS + else if([event modifierFlags] & NSCommandKeyMask && substitutingForCommandKey == false) { [NSApp sendEvent:event]; return; } + // if the command key is held down and we want the guest OS to handle it + if(([event modifierFlags] & NSCommandKeyMask) && (substitutingForCommandKey == true)) { + kbd_put_keycode(219); // command key + kbd_put_keycode(cocoa_keycode_to_qemu([event keyCode])); // any other keys + return; + } + // default keycode = cocoa_keycode_to_qemu([event keyCode]); - + // handle control + alt Key Combos (ctrl+alt is reserved for QEMU) if (([event modifierFlags] & NSControlKeyMask) && ([event modifierFlags] & NSAlternateKeyMask)) { switch (keycode) { @@ -584,7 +678,7 @@ QemuCocoaView *cocoaView; if (qemu_console_is_graphic(NULL)) { if (keycode & 0x80) kbd_put_keycode(0xe0); - kbd_put_keycode(keycode | 0x80); //add 128 to signal release of key + kbd_put_keycode(keycode | 0x80); //add 128 (0x80) to signal release of key } break; case NSMouseMoved: @@ -810,8 +904,9 @@ QemuCocoaView *cocoaView; - (void)startEmulationWithArgc:(int)argc argv:(char**)argv { COCOA_DEBUG("QemuCocoaAppController: startEmulationWithArgc\n"); - + int status; + handleCommandKeyOption(&argc, argv); status = qemu_main(argc, argv, *_NSGetEnviron()); exit(status); } @@ -1047,3 +1142,5 @@ void cocoa_display_init(DisplayState *ds, int full_screen) // register cleanup function atexit(cocoa_cleanup); } + + -- 1.7.5.4

1 0