OpenBIOS October 2016

openbios@openbios.org

5 participants
16 discussions

[PATCH v2] Add user resolutions to QEMU, VGA node's fb-modes property.
by Programmingkid 10 Oct '16

10 Oct '16

Implement the add-resolutions word. It will copy the user resolutions in the options node's resolutions property to the QEMU,VGA node's fb-modes property. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> --- This patch depends on the vga resolutions patch. Moved the code to the vga.fs file. Replaced local variables with values. arch/ppc/qemu/init.c | 2 +- drivers/vga.fs | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 1 deletion(-) diff --git a/arch/ppc/qemu/init.c b/arch/ppc/qemu/init.c index 6f21814..df873ce 100644 --- a/arch/ppc/qemu/init.c +++ b/arch/ppc/qemu/init.c @@ -631,7 +631,7 @@ go(void) if (find_dev("/rom/macos")) { fword("insert-copyright-property"); } - + feval("add-resolutions"); feval("saved-program-state >sps.entry @"); addr = POP(); diff --git a/drivers/vga.fs b/drivers/vga.fs index 0411462..fb3749f 100644 --- a/drivers/vga.fs +++ b/drivers/vga.fs @@ -225,4 +225,80 @@ headerless qemu-vga-driver-init + +\ Adds user's resolutions from /Options node's resolutions property to +\ /pci/QEMU,VGA node's fb-modes property. +\ Turns a string of "widthxheight,..." into an array of ints. + +0 value fb-mode-addr +0 value fb-mode-len +0 value res-value +0 value res-addr +0 value res-len + +: add-resolutions ( -- ) + decimal + " /options" " find-device" evaluate ( -- ) + " resolutions" " active-package" evaluate + " get-package-property" evaluate ( -- res-addr res-len false ) + abort" " \ Fail quietly because user resolutions are optional + to res-len + to res-addr + + \ Add the first resolution value to the array + 0 0 res-addr res-len + " >number" evaluate + to res-len to res-addr + drop encode-int + to fb-mode-len to fb-mode-addr + res-addr res-len 1 " /string" evaluate + to res-len to res-addr + + begin + res-len 0 = not + while + 0 0 + res-addr res-len + " >number" evaluate ( ud1 c-addr1 u1 -- ud2 0 c-addr2 u2 ) + to res-len + to res-addr + drop + to res-value + + \ go to the next number after 'x' or ',' + res-addr res-len 1 " /string" evaluate + to res-len + to res-addr + + \ Encode and add res-value to array + fb-mode-addr fb-mode-len res-value ( -- fb-mode-addr fb-mode-len res-value ) + encode-int ( -- new-fb-mode-addr new-fb-mode-len ) + encode+ ( -- new-fb-mode-addr new-fb-mode-len ) + to fb-mode-len + to fb-mode-addr + repeat + + \ Get the original resolutions + " /pci/QEMU,VGA" " find-device" evaluate ( -- ) + " fb-modes" " active-package" evaluate + get-package-property ( -- prop-addr prop-len false ) + abort" Could not find fb-modes property in QEMU,VGA node!" ( -- prop-addr prop-len ) + + \ Needed to fix a limit of encode+ + encode-bytes ( -- new-prop-addr new-prop-len ) + + fb-mode-addr fb-mode-len ( -- new-prop-addr new-prop-len fb-mode-addr fb-mode-len ) + 2swap ( -- fb-mode-addr fb-mode-len new-prop-addr new-prop-len ) + + \ Add user resolutions first then add built-in resolutions if space permits + encode+ ( -- new-addr new-len ) + to fb-mode-len + to fb-mode-addr + + \ Update fb-modes property + " /pci/QEMU,VGA" " find-device" evaluate + fb-mode-addr fb-mode-len + " fb-modes" property +; + end0 -- 2.7.2

1 0

Help with patch
by Programmingkid 10 Oct '16

10 Oct '16

I want to place vga related code in the vga.fs file, but it just doesn't compile. Here are some of the errors I see: Error: File /Users/john/Desktop/openbios/drivers/vga.fs, Line 234. (Output Position = 1166). Word find-device is not in dictionary. Error: File /Users/john/Desktop/openbios/drivers/vga.fs, Line 235. (Output Position = 1179). Word active-package is not in dictionary. Is there a way to fix this error?

3 3

[PATCH] Add user resolutions to QEMU, VGA node's fb-modes property.
by Programmingkid 09 Oct '16

09 Oct '16

Implement the add-resolutions word. It will copy the user resolutions in the options node's resolutions property to the QEMU,VGA node's fb-modes property. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> --- arch/ppc/qemu/init.c | 2 +- arch/ppc/qemu/qemu.fs | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 1 deletion(-) diff --git a/arch/ppc/qemu/init.c b/arch/ppc/qemu/init.c index 6f21814..df873ce 100644 --- a/arch/ppc/qemu/init.c +++ b/arch/ppc/qemu/init.c @@ -631,7 +631,7 @@ go(void) if (find_dev("/rom/macos")) { fword("insert-copyright-property"); } - + feval("add-resolutions"); feval("saved-program-state >sps.entry @"); addr = POP(); diff --git a/arch/ppc/qemu/qemu.fs b/arch/ppc/qemu/qemu.fs index 3d99a34..10df618 100644 --- a/arch/ppc/qemu/qemu.fs +++ b/arch/ppc/qemu/qemu.fs @@ -138,3 +138,71 @@ variable keyboard-phandle 0 keyboard-phandle ! 3drop 0 then ; + +\ Adds user's resolutions from /Options node's resolutions property to +\ /pci/QEMU,VGA node's fb-modes property. +\ Turns a string of "widthxheight,..." into an array of ints. + +: add-resolutions { ; fb-mode-addr fb-mode-len value res-addr res-len } ( -- ) + decimal + + " /options" find-device ( -- ) + " resolutions" active-package get-package-property ( -- res-addr res-len false ) + abort" " \ Fail quietly because user resolutions are optional + -> res-len + -> res-addr + + \ Add the first value to the array + 0 0 res-addr res-len + >number + -> res-len -> res-addr + drop encode-int + -> fb-mode-len -> fb-mode-addr + res-addr res-len 1 /string + -> res-len -> res-addr + + begin + res-len 0 = not + while + 0 0 + res-addr res-len + >number ( ud1 c-addr1 u1 -- ud2 0 c-addr2 u2 ) + -> res-len + -> res-addr + drop + -> value + + \ go to the next number after 'x' or ',' + res-addr res-len 1 /string + -> res-len + -> res-addr + + \ Encode and add value to array + fb-mode-addr fb-mode-len value ( -- fb-mode-addr fb-mode-len value ) + encode-int ( -- new-fb-mode-addr new-fb-mode-len ) + encode+ ( -- new-fb-mode-addr new-fb-mode-len ) + -> fb-mode-len + -> fb-mode-addr + repeat + + \ Get the original resolutions + " /pci/QEMU,VGA" find-device ( -- ) + " fb-modes" active-package get-package-property ( -- prop-addr prop-len false ) + abort" Could not find fb-modes property in QEMU,VGA node!" ( -- prop-addr prop-len ) + + \ Needed to fix a limit of encode+ + encode-bytes ( -- new-prop-addr new-prop-len ) + + fb-mode-addr fb-mode-len ( -- new-prop-addr new-prop-len fb-mode-addr fb-mode-len ) + 2swap ( -- fb-mode-addr fb-mode-len new-prop-addr new-prop-len ) + + \ Add user resolutions first then add built-in resolutions if space permits + encode+ ( -- new-addr new-len ) + -> fb-mode-len + -> fb-mode-addr + + \ Update fb-modes property + " /pci/QEMU,VGA" find-device + fb-mode-addr fb-mode-len + " fb-modes" property +; -- 2.7.2

3 2

[PATCH] Implement print-resolutions word
by Programmingkid 07 Oct '16

07 Oct '16

The print-resolutions word prints all the resolutions in the QEMU,VGA node's fb-modes property. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> --- This patch may depend on the add-resolutions patch. arch/ppc/qemu/qemu.fs | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/arch/ppc/qemu/qemu.fs b/arch/ppc/qemu/qemu.fs index 10df618..745f8c8 100644 --- a/arch/ppc/qemu/qemu.fs +++ b/arch/ppc/qemu/qemu.fs @@ -206,3 +206,22 @@ variable keyboard-phandle 0 keyboard-phandle ! fb-mode-addr fb-mode-len " fb-modes" property ; + +\ print all of the resolutions in the QEMU,VGA node +: print-resolutions { ; fb-mode-addr fb-mode-len } + decimal + " /pci/QEMU,VGA" find-device ( -- ) + " fb-modes" active-package get-package-property + abort" Could not find fb-modes property" + -> fb-mode-len + -> fb-mode-addr + + fb-mode-addr fb-mode-len + 4 - \ limit + fb-mode-addr \ initial value + cr ." Resolutions:" cr + do + I aligned @ . \ print width + ." x " \ print x + I 1+ aligned @ . cr \ print height + 8 +loop +; -- 2.7.2

1 0

[PATCH 2/2] implement convert_to_ints()
by Programmingkid 02 Oct '16

02 Oct '16

convert_to_ints() converts all the string resolutions in the resolutions property of the QEMU,VGA node and converts them to an int array. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> --- arch/ppc/qemu/init.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/arch/ppc/qemu/init.c b/arch/ppc/qemu/init.c index 6f21814..b6c7db0 100644 --- a/arch/ppc/qemu/init.c +++ b/arch/ppc/qemu/init.c @@ -619,6 +619,83 @@ id_cpu(void) } } + +/* convert ASCII string to number */ +static int atoi(const char *str) +{ + int result = 0; + while (*str) { + result = result * 10 + *str - '0'; + str++; + } + return result; +} + +void convert_to_ints(void); + +/* Converts the QEMU,VGA node's resolutions property to int's*/ +void convert_to_ints(void) +{ + const int max_buffer_size = 200; + char *orig_property; + char buffer[max_buffer_size]; + int index, count, value, addr, len; + char c; + + count = 0; + index = 0; + push_str("/pci/QEMU,VGA"); + fword("find-package"); + if (POP() == 0) { + fword("cr"); + push_str("convert-to-ints(): could not find package /pci/QEMU,VGA!"); + fword("type"); + fword("cr"); + return; + } + fword("active-package!"); + push_str("resolutions"); + fword("active-package"); + fword("get-package-property"); + if (POP() == -1) { + fword("cr"); + push_str("convert-to-ints(): could not find resolutions property!"); + fword("type"); + fword("cr"); + return; + } + len = POP(); + addr = POP(); + orig_property = (char *) malloc(len); + strncpy(orig_property, (char *)addr, len); + c = orig_property[0]; + while(c != '\0') { + if (c == 'x' || c == ',') { + buffer[index] = '\0'; + value = atoi(buffer); + count++; + if (count == 3) { + count = 1; + fword("encode+"); + continue; + } + PUSH(value); + fword("encode-int"); + index = -1; + } + else { + buffer[index] = c; + } + index++; + c = *(++orig_property); + } + fword("encode+"); + push_str("resolutions"); + fword("property"); + free(orig_property); +} + + static void go(void); unsigned int start_elf(unsigned long entry_point, unsigned long param); @@ -632,6 +709,10 @@ go(void) fword("insert-copyright-property"); } + /* Used to support user specified resolutions */ + fword("copy-resolutions-property"); + convert_to_ints(); + feval("saved-program-state >sps.entry @"); addr = POP(); @@ -1078,3 +1159,4 @@ arch_of_init(void) bind_func("platform-boot", boot); bind_func("(go)", go); } + -- 2.7.2

6 29

[PATCH] vga resolutions
by Programmingkid 01 Oct '16

01 Oct '16

Add resolutions for the VGA driver to use in a property called fb-modes. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> --- drivers/vga.fs | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/drivers/vga.fs b/drivers/vga.fs index 29a043a..0411462 100644 --- a/drivers/vga.fs +++ b/drivers/vga.fs @@ -197,6 +197,29 @@ headerless depth-bits encode-int " depth" property line-bytes encode-int " linebytes" property + \ resolutions for the VGA driver + 512 encode-int 342 encode-int encode+ + 640 encode-int encode+ 400 encode-int encode+ + 640 encode-int encode+ 480 encode-int encode+ + 800 encode-int encode+ 600 encode-int encode+ + 1024 encode-int encode+ 640 encode-int encode+ + 1024 encode-int encode+ 768 encode-int encode+ + 1152 encode-int encode+ 864 encode-int encode+ + 1200 encode-int encode+ 700 encode-int encode+ + 1280 encode-int encode+ 720 encode-int encode+ + 1280 encode-int encode+ 768 encode-int encode+ + 1280 encode-int encode+ 800 encode-int encode+ + 1440 encode-int encode+ 900 encode-int encode+ + 1920 encode-int encode+ 1200 encode-int encode+ + 2304 encode-int encode+ 1440 encode-int encode+ + 2560 encode-int encode+ 1600 encode-int encode+ + 2880 encode-int encode+ 1800 encode-int encode+ + 4096 encode-int encode+ 2304 encode-int encode+ + 5120 encode-int encode+ 2880 encode-int encode+ + 8192 encode-int encode+ 4608 encode-int encode+ + + " fb-modes" property + ['] qemu-vga-driver-install is-install ; -- 2.7.2

1 0