[OpenBIOS] [commit] r1195 - in trunk/openbios-devel: drivers forth/device libopenbios

[repository service]

Author: mcayland
Date: Sat Jul 27 15:17:41 2013
New Revision: 1195
URL: http://tracker.coreboot.org/trac/openbios/changeset/1195

Log:
video: rename qemu-video-* words to openbios-video-*

Now that the second half of the display rework is complete, the qemu-video-*
words are no longer QEMU-specific. This is because we now initialise the
defaults to the value of the VGA_DEFAULT_* constants and only attempt to
override them with the values supplied by the QEMU firmware interface if
built with CONFIG_QEMU enabled.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland at ilande.co.uk>

Modified:
   trunk/openbios-devel/drivers/tcx.fs
   trunk/openbios-devel/drivers/vga.fs
   trunk/openbios-devel/forth/device/display.fs
   trunk/openbios-devel/libopenbios/video_common.c

Modified: trunk/openbios-devel/drivers/tcx.fs
==============================================================================
--- trunk/openbios-devel/drivers/tcx.fs	Sat Jul 27 13:22:06 2013	(r1194)
+++ trunk/openbios-devel/drivers/tcx.fs	Sat Jul 27 15:17:41 2013	(r1195)
@@ -12,28 +12,28 @@
 \ and height, grab the ones passed in by QEMU/generated by OpenBIOS
 \
 
-: qemu-video-addr
-  " qemu-video-addr" $find if
+: openbios-video-addr
+  " openbios-video-addr" $find if
     cell+ @
   then
 ;
 
-: qemu-video-width
-  " qemu-video-width" $find if
+: openbios-video-width
+  " openbios-video-width" $find if
     cell+ @
   then
 ;
 
-: qemu-video-height
-  " qemu-video-height" $find if
+: openbios-video-height
+  " openbios-video-height" $find if
     cell+ @
   then
 ;
 
 : qemu-tcx-driver-install ( -- )
-  qemu-video-addr to frame-buffer-adr
+  openbios-video-addr to frame-buffer-adr
   default-font set-font
-  qemu-video-width qemu-video-height over char-width / over char-height /
+  openbios-video-width openbios-video-height over char-width / over char-height /
   fb8-install
 ;
 

Modified: trunk/openbios-devel/drivers/vga.fs
==============================================================================
--- trunk/openbios-devel/drivers/vga.fs	Sat Jul 27 13:22:06 2013	(r1194)
+++ trunk/openbios-devel/drivers/vga.fs	Sat Jul 27 15:17:41 2013	(r1195)
@@ -12,28 +12,28 @@
 \ and height, grab the ones passed in by QEMU/generated by OpenBIOS
 \
 
-: qemu-video-addr
-  " qemu-video-addr" $find if
+: openbios-video-addr
+  " openbios-video-addr" $find if
     cell+ @
   then
 ;
 
-: qemu-video-width
-  " qemu-video-width" $find if
+: openbios-video-width
+  " openbios-video-width" $find if
     cell+ @
   then
 ;
 
-: qemu-video-height
-  " qemu-video-height" $find if
+: openbios-video-height
+  " openbios-video-height" $find if
     cell+ @
   then
 ;
 
 : qemu-vga-driver-install ( -- )
-  qemu-video-addr to frame-buffer-adr
+  openbios-video-addr to frame-buffer-adr
   default-font set-font
-  qemu-video-width qemu-video-height over char-width / over char-height /
+  openbios-video-width openbios-video-height over char-width / over char-height /
   fb8-install
 ;
 

Modified: trunk/openbios-devel/forth/device/display.fs
==============================================================================
--- trunk/openbios-devel/forth/device/display.fs	Sat Jul 27 13:22:06 2013	(r1194)
+++ trunk/openbios-devel/forth/device/display.fs	Sat Jul 27 15:17:41 2013	(r1195)
@@ -50,10 +50,10 @@
 0 value line-bytes
 0 value display-ih
 
-\ internal values read from QEMU firmware interface
-0 value qemu-video-addr
-0 value qemu-video-height
-0 value qemu-video-width
+\ internal values
+0 value openbios-video-addr
+0 value openbios-video-height
+0 value openbios-video-width
 
 \ The following wordset is called the "defer word interface" of the 
 \ terminal-emulator support package. It gets overloaded by fb1-install

Modified: trunk/openbios-devel/libopenbios/video_common.c
==============================================================================
--- trunk/openbios-devel/libopenbios/video_common.c	Sat Jul 27 13:22:06 2013	(r1194)
+++ trunk/openbios-devel/libopenbios/video_common.c	Sat Jul 27 15:17:41 2013	(r1195)
@@ -224,11 +224,11 @@
 	feval("['] display-ih cell+");
 	video.ih = cell2pointer(POP());
 
-	feval("['] qemu-video-addr cell+");
+	feval("['] openbios-video-addr cell+");
 	video.mvirt = cell2pointer(POP());
-	feval("['] qemu-video-width cell+");
+	feval("['] openbios-video-width cell+");
 	video.w = cell2pointer(POP());
-	feval("['] qemu-video-height cell+");
+	feval("['] openbios-video-height cell+");
 	video.h = cell2pointer(POP());
 	feval("['] depth-bits cell+");
 	video.depth = cell2pointer(POP());