openfirmware May 2011

openfirmware@openfirmware.info

4 participants
48 discussions

[commit] r2229 - cpu/x86/pc/biosload
by repository service 26 May '11

26 May '11

Author: wmb Date: Thu May 26 10:59:12 2011 New Revision: 2229 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2229 Log: BIOSload version - changed the real-mode startup code so its GDT is compatible with callbios.fth, and fixed the virtualbox config to use a VESA console. Modified: cpu/x86/pc/biosload/biostart.bth cpu/x86/pc/biosload/config-virtualbox.fth cpu/x86/pc/biosload/fw.bth cpu/x86/pc/biosload/ofw.bth Modified: cpu/x86/pc/biosload/biostart.bth ============================================================================== --- cpu/x86/pc/biosload/biostart.bth Thu May 26 10:11:24 2011 (r2228) +++ cpu/x86/pc/biosload/biostart.bth Thu May 26 10:59:12 2011 (r2229) @@ -50,14 +50,16 @@ label gdt-template \ Will be copied to gdt-pa 0 le-w, 0 le-l, 0 le-w, \ 0 Mandatory null descriptor - 0 le-w, 0 le-l, 0 le-w, \ * Another null descriptor - ffff le-w, 9b.000000 le-l, 00.c.f le-w, \ 10 Code, linear=physical, 4GB - ffff le-w, 93.000000 le-l, 00.c.f le-w, \ 18 Data, linear=physical, 4GB + ffff le-w, 9b.000000 le-l, 0 le-w, \ 8 16-bit code, linear=physical, 64K + ffff le-w, 93.000000 le-l, 00.8.f le-w, \ 10 16-bit data, linear=physical, 4GB + ffff le-w, 93.000000 le-l, 0 le-w, \ 18 16-bit data, linear=physical, 64K + ffff le-w, 9b.000000 le-l, 00.c.f le-w, \ 20 Code, linear=physical, 4GB + ffff le-w, 93.000000 le-l, 00.c.f le-w, \ 28 Data, linear=physical, 4GB end-code label gdt-end end-code label gdt-ptr \ GDT limit + address - 1f le-w, gdt-pa le-l, \ # slots (3 * 8 - 1) , starting address + 2f le-w, gdt-pa le-l, \ # slots (3 * 8 - 1) , starting address end-code h# 100 pad-to \ space for stack @@ -191,7 +193,7 @@ \ Execute a far jump to following code to reload CS with a \ protected mode selector. The offset portion of the address \ (here asm-base - 7 +) has been relocated by the code above. - op: here asm-base - 7 + 10 #) far jmp + op: here asm-base - 7 + 20 #) far jmp 32-bit \ The following 2 lines execute at compile time, patching the @@ -202,7 +204,7 @@ here asm-base - 6 - r> le-w! \ set segment registers - 18 # bx mov \ Data segment selector + 28 # bx mov \ Data segment selector bx ds mov \ Set segment register bx es mov \ Set segment register bx fs mov \ Set segment register Modified: cpu/x86/pc/biosload/config-virtualbox.fth ============================================================================== --- cpu/x86/pc/biosload/config-virtualbox.fth Thu May 26 10:11:24 2011 (r2228) +++ cpu/x86/pc/biosload/config-virtualbox.fth Thu May 26 10:59:12 2011 (r2229) @@ -10,6 +10,8 @@ \ create debug-startup \ create serial-console +create pc + create resident-packages create addresses-assigned \ Don't reassign PCI addresses \ create virtual-mode @@ -17,7 +19,8 @@ create use-timestamp-counter create use-pci-isa create use-isa-ide -create use-ega +\ create use-ega +create use-vesa create use-elf \ create use-ne2000 create use-watch-all Modified: cpu/x86/pc/biosload/fw.bth ============================================================================== --- cpu/x86/pc/biosload/fw.bth Thu May 26 10:11:24 2011 (r2228) +++ cpu/x86/pc/biosload/fw.bth Thu May 26 10:59:12 2011 (r2229) @@ -186,10 +186,7 @@ fload ${BP}/cpu/x86/pc/rmtools.fth fload ${BP}/cpu/x86/pc/biosload/callbios.fth - -[ifdef] syslinux-loaded fload ${BP}/cpu/x86/pc/biosload/callvbe.fth -[then] fload ${BP}/cpu/x86/pc/biosload/devices.fth Modified: cpu/x86/pc/biosload/ofw.bth ============================================================================== --- cpu/x86/pc/biosload/ofw.bth Thu May 26 10:11:24 2011 (r2228) +++ cpu/x86/pc/biosload/ofw.bth Thu May 26 10:59:12 2011 (r2229) @@ -1,7 +1,7 @@ purpose: Construct the final BIOS-start OFW image command: &builder &this -\ in: biostart.img +in: biostart.img in: reset.di in: start.di in: ${BP}/cpu/x86/pc/biosload/build/paging.di

1 0

[commit] r2228 - cpu/x86/pc/biosload
by repository service 26 May '11

26 May '11

Author: wmb Date: Thu May 26 10:11:24 2011 New Revision: 2228 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2228 Log: BIOSload version - added floppy image format to ofw.bth for virtualbox config Modified: cpu/x86/pc/biosload/config-virtualbox.fth cpu/x86/pc/biosload/ofw.bth Modified: cpu/x86/pc/biosload/config-virtualbox.fth ============================================================================== --- cpu/x86/pc/biosload/config-virtualbox.fth Thu May 26 02:16:32 2011 (r2227) +++ cpu/x86/pc/biosload/config-virtualbox.fth Thu May 26 10:11:24 2011 (r2228) @@ -6,6 +6,7 @@ \ Load and run in VirtualBox (also works for other emulators) create virtualbox-loaded +create real-mode-entry \ create debug-startup \ create serial-console Modified: cpu/x86/pc/biosload/ofw.bth ============================================================================== --- cpu/x86/pc/biosload/ofw.bth Thu May 26 02:16:32 2011 (r2227) +++ cpu/x86/pc/biosload/ofw.bth Thu May 26 10:11:24 2011 (r2228) @@ -36,6 +36,10 @@ hex +[ifdef] virtualbox-loaded +writing floppyofw.img +[then] + [ifdef] grub-loaded fload ${BP}/cpu/x86/pc/elfhdr.fth .( --- Saving as ofwgrub.elf - GRUB multiboot format) cr

1 0

[commit] r2227 - cpu/arm/olpc/1.75
by repository service 26 May '11

26 May '11

Author: wmb Date: Thu May 26 02:16:32 2011 New Revision: 2227 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2227 Log: OLPC trac #10889 and #10890 - Added LEDs and switches selftests to XO-1.75. Added: cpu/arm/olpc/1.75/leds.fth cpu/arm/olpc/1.75/switches.fth Modified: cpu/arm/olpc/1.75/fw.bth Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Thu May 26 01:56:39 2011 (r2226) +++ cpu/arm/olpc/1.75/fw.bth Thu May 26 02:16:32 2011 (r2227) @@ -146,6 +146,10 @@ fload ${BP}/cpu/x86/pc/olpc/plot.fth fload ${BP}/cpu/arm/olpc/1.75/testinstructions.fth +fload ${BP}/cpu/arm/olpc/1.75/switches.fth \ Lid and ebook switches +fload ${BP}/cpu/arm/olpc/1.75/leds.fth \ LEDs +\ fload ${BP}/cpu/x86/pc/olpc/via/factory.fth \ Manufacturing tools + \ Pseudo device that appears in the boot order before net booting 0 0 " " " /" begin-package " prober" device-name Added: cpu/arm/olpc/1.75/leds.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/1.75/leds.fth Thu May 26 02:16:32 2011 (r2227) @@ -0,0 +1,42 @@ +\ See license at end of file +purpose: Driver/selftest for OLPC XO-1.75 LEDs + +0 0 " 0" " /" begin-package +0 0 reg \ So test-all will run the test +" leds" device-name +: open ( -- okay? ) true ; +: close ( -- ) ; +: hdd-led-on ( -- ) d# 10 gpio-set ; +: hdd-led-off ( -- ) d# 10 gpio-clr ; +: selftest ( -- ) + ." Flashing LEDs" cr + " /wlan" test-dev " /wlan" test-dev \ Twice for longer flashing + d# 20 0 do hdd-led-on d# 100 ms hdd-led-off d# 100 ms loop + confirm-selftest? +; + +end-package + +\ LICENSE_BEGIN +\ Copyright (c) 2011 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END Added: cpu/arm/olpc/1.75/switches.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/1.75/switches.fth Thu May 26 02:16:32 2011 (r2227) @@ -0,0 +1,63 @@ +\ See license at end of file +purpose: Driver/selftest for OLPC lid and ebook switches + +0 0 " 0" " /" begin-package +" switches" device-name +0 0 reg \ So test-all will run the test +: open ( -- okay? ) true ; +: close ( -- ) ; +: lid? ( -- flag ) d# 129 gpio-pin@ 0= ; +: ebook? ( -- flag ) d# 128 gpio-pin@ 0= ; + +: ?key-abort ( -- ) key? if key esc = abort" Aborted" then ; +: wait-not-lid ( -- ) + ." Deactivate lid switch" cr + begin ?key-abort lid? 0= until +; +: wait-lid ( -- ) + ." Activate lid switch" cr + begin ?key-abort lid? until +; +: wait-not-ebook ( -- ) + ." Deactivate ebook switch" cr + begin ?key-abort ebook? 0= until +; +: wait-ebook ( -- ) + ." Activate ebook switch" cr + begin ?key-abort ebook? until +; + +: all-switch-states ( -- ) + lid? if wait-not-lid else wait-lid then + ebook? if wait-not-ebook else wait-ebook then +; + +: selftest ( -- error? ) + ['] all-switch-states catch +; + +end-package + +\ LICENSE_BEGIN +\ Copyright (c) 2011 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END

1 0

[commit] r2226 - in cpu: arm/olpc/1.75 x86/pc/olpc x86/pc/olpc/via
by repository service 26 May '11

26 May '11

Author: wmb Date: Thu May 26 01:56:39 2011 New Revision: 2226 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2226 Log: OLPC trac #10896 - Implement persistent volume control for XO-1.75 (in the process, I moved the relevant code, which was duplicated between XO-1 and XO-1.5, into a common file that is used by all versions). Modified: cpu/arm/olpc/1.75/fw.bth cpu/arm/olpc/1.75/sound.fth cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/sound.fth cpu/x86/pc/olpc/via/fw.bth Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Thu May 26 01:13:22 2011 (r2225) +++ cpu/arm/olpc/1.75/fw.bth Thu May 26 01:56:39 2011 (r2226) @@ -231,6 +231,10 @@ ['] $call-method catch if 2drop 3drop then ; code halt ( -- ) wfi c; + +: dimmer ( -- ) screen-ih if " dimmer" screen-ih $call-method then ; +: brighter ( -- ) screen-ih if " brighter" screen-ih $call-method then ; + fload ${BP}/cpu/x86/pc/olpc/sound.fth fload ${BP}/cpu/x86/pc/olpc/guardrtc.fth fload ${BP}/cpu/x86/pc/olpc/security.fth Modified: cpu/arm/olpc/1.75/sound.fth ============================================================================== --- cpu/arm/olpc/1.75/sound.fth Thu May 26 01:13:22 2011 (r2225) +++ cpu/arm/olpc/1.75/sound.fth Thu May 26 01:56:39 2011 (r2226) @@ -1,9 +1,9 @@ -0 0 " d42a0c00" " /" begin-package +0 0 " d42a0800" " /" begin-package " audio" name -my-space h# 40 reg +my-space h# 800 reg -h# d42a.0c00 constant sspa-base -h# d42a.0800 constant adma-base +0 value sspa-base \ E.g. h# d42a.0c00 +0 value adma-base \ E.g. h# d42a.0800 : sspa! ( n offset -- ) sspa-base + l! ; \ Write a register in SSPA1 : sspa@ ( offset -- n ) sspa-base + l@ ; \ Read a register in SSPA1 : adma! ( n offset -- ) adma-base + l! ; @@ -170,11 +170,17 @@ my-in-desc 3 la+ l@ to my-in-desc ; +[ifdef] cl2-a1 +: choose-smbus ( -- ) h# 30 1 set-twsi-target ; +[else] +: choose-smbus ( -- ) h# 34 1 set-twsi-target ; +[then] + \ Reset is unconnected on current boards \ : audio-reset ( -- ) 8 gpio-clr ; \ : audio-unreset ( -- ) 8 gpio-set ; -: codec@ ( reg# -- w ) 1 2 twsi-get swap bwjoin ; -: codec! ( w reg# -- ) >r wbsplit r> 3 twsi-write ; +: codec@ ( reg# -- w ) choose-smbus 1 2 twsi-get swap bwjoin ; +: codec! ( w reg# -- ) choose-smbus >r wbsplit r> 3 twsi-write ; : codec-i@ ( index# -- w ) h# 6a codec! h# 6c codec@ ; : codec-i! ( w index# -- ) h# 6a codec! h# 6c codec! ; @@ -346,12 +352,8 @@ [then] [ifdef] cl2-a1 -: init-smbus ( -- ) h# 30 1 set-twsi-target ; - fload ${BP}/cpu/arm/olpc/1.75/alc5624.fth \ Realtek ALC5624 CODEC [else] -: init-smbus ( -- ) h# 34 1 set-twsi-target ; - : headphones-inserted? ( -- flag ) d# 97 gpio-pin@ ; : microphone-inserted? ( -- flag ) d# 96 gpio-pin@ ; @@ -378,20 +380,25 @@ : mono ; : init-codec ( -- ) - init-smbus codec-on set-default-gains d# 48000 set-sample-rate ; 0 value open-count : open ( -- flag ) - open-count 0= if audio-clock-on init-codec then + open-count 0= if + my-space h# 800 " map-in" $call-parent to adma-base + adma-base h# 400 + to sspa-base + audio-clock-on init-codec + then open-count 1+ to open-count true ; : close ( -- ) open-count 1 = if uninstall-playback-alarm codec-off ( audio-clock-off ) + adma-base h# 800 " map-out" $call-parent + 0 to adma-base 0 to sspa-base then open-count 1- 0 max to open-count ; Modified: cpu/x86/pc/olpc/fw.bth ============================================================================== --- cpu/x86/pc/olpc/fw.bth Thu May 26 01:13:22 2011 (r2225) +++ cpu/x86/pc/olpc/fw.bth Thu May 26 01:56:39 2011 (r2226) @@ -359,6 +359,9 @@ fload ${BP}/cpu/x86/pc/biosints.fth fload ${BP}/cpu/x86/pc/olpc/biosresume.fth +: dimmer ( -- ) screen-ih if " dimmer" screen-ih $call-method then ; +: brighter ( -- ) screen-ih if " brighter" screen-ih $call-method then ; + fload ${BP}/cpu/x86/pc/olpc/setwp.fth fload ${BP}/cpu/x86/pc/olpc/sound.fth fload ${BP}/cpu/x86/pc/olpc/guardrtc.fth @@ -388,39 +391,6 @@ \needs ramdisk " " d# 128 config-string ramdisk " " ' boot-file set-config-string-default \ Let the boot script set the cmdline -: dimmer ( -- ) screen-ih if " dimmer" screen-ih $call-method then ; -: brighter ( -- ) screen-ih if " brighter" screen-ih $call-method then ; - -dev /8042/keyboard -0 value waiting-up? -: olpc-check-abort ( scan-code -- abort? ) \ Square pressed? - last-scan over to last-scan ( scan-code old-scan-code ) - h# e0 <> if drop false exit then ( scan-code ) - - check-abort? 0= if drop false exit then ( scan-code ) - - dup h# 7f and h# 5d <> if drop false exit then ( scan-code ) - - h# 80 and if \ Up - false to waiting-up? - false ( abort? ) - else - secure? if false else waiting-up? 0= then ( abort? ) - true to waiting-up? - then -; -patch olpc-check-abort check-abort get-scan - -: handle-volume? ( scan-code -- scan-code flag ) - dup h# 43 = if dimmer true exit then - dup h# 44 = if brighter true exit then - dup h# 57 = if softer true exit then - dup h# 58 = if louder true exit then - false -; -' handle-volume? to scan-handled? -dend - \ Eliminate 4 second delay in install console for the case where \ there is no keyboard. The delay is unnecessary because the screen \ does not go blank when the device is closed. Modified: cpu/x86/pc/olpc/sound.fth ============================================================================== --- cpu/x86/pc/olpc/sound.fth Thu May 26 01:13:22 2011 (r2225) +++ cpu/x86/pc/olpc/sound.fth Thu May 26 01:56:39 2011 (r2226) @@ -54,6 +54,36 @@ close-audio ; +dev /keyboard +0 value waiting-up? +: olpc-check-abort ( scan-code -- abort? ) \ Square pressed? + last-scan over to last-scan ( scan-code old-scan-code ) + h# e0 <> if drop false exit then ( scan-code ) + + check-abort? 0= if drop false exit then ( scan-code ) + + dup h# 7f and h# 5d <> if drop false exit then ( scan-code ) + + h# 80 and if \ Up + false to waiting-up? + false ( abort? ) + else + secure? if false else waiting-up? 0= then ( abort? ) + true to waiting-up? + then +; +patch olpc-check-abort check-abort get-scan + +: handle-volume? ( scan-code -- scan-code flag ) + dup h# 43 = if dimmer true exit then + dup h# 44 = if brighter true exit then + dup h# 57 = if softer true exit then + dup h# 58 = if louder true exit then + false +; +' handle-volume? to scan-handled? +dend + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \ Modified: cpu/x86/pc/olpc/via/fw.bth ============================================================================== --- cpu/x86/pc/olpc/via/fw.bth Thu May 26 01:13:22 2011 (r2225) +++ cpu/x86/pc/olpc/via/fw.bth Thu May 26 01:56:39 2011 (r2226) @@ -403,6 +403,9 @@ fload ${BP}/cpu/x86/pc/olpc/biosresume.fth [then] +: dimmer ( -- ) screen-ih if " dimmer" screen-ih $call-method then ; +: brighter ( -- ) screen-ih if " brighter" screen-ih $call-method then ; + fload ${BP}/cpu/x86/firfilter.fth fload ${BP}/cpu/x86/pc/olpc/sound.fth fload ${BP}/cpu/x86/pc/olpc/via/sound.fth @@ -422,39 +425,6 @@ \needs ramdisk " " d# 128 config-string ramdisk " " ' boot-file set-config-string-default \ Let the boot script set the cmdline -: dimmer ( -- ) screen-ih if " dimmer" screen-ih $call-method then ; -: brighter ( -- ) screen-ih if " brighter" screen-ih $call-method then ; - -dev /8042/keyboard -0 value waiting-up? -: olpc-check-abort ( scan-code -- abort? ) \ Square pressed? - last-scan over to last-scan ( scan-code old-scan-code ) - h# e0 <> if drop false exit then ( scan-code ) - - check-abort? 0= if drop false exit then ( scan-code ) - - dup h# 7f and h# 5d <> if drop false exit then ( scan-code ) - - h# 80 and if \ Up - false to waiting-up? - false ( abort? ) - else - secure? if false else waiting-up? 0= then ( abort? ) - true to waiting-up? - then -; -patch olpc-check-abort check-abort get-scan - -: handle-volume? ( scan-code -- scan-code flag ) - dup h# 43 = if dimmer true exit then - dup h# 44 = if brighter true exit then - dup h# 57 = if softer true exit then - dup h# 58 = if louder true exit then - false -; -' handle-volume? to scan-handled? -dend - \ Eliminate 4 second delay in install console for the case where \ there is no keyboard. The delay is unnecessary because the screen \ does not go blank when the device is closed.

1 0

[commit] r2225 - cpu/arm/olpc/1.75 dev/olpc/keyboard
by repository service 26 May '11

26 May '11

Author: wmb Date: Thu May 26 01:13:22 2011 New Revision: 2225 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2225 Log: OLPC trac #10888 - Handle XO-1.75 game buttons in keyboard selftest. Modified: cpu/arm/olpc/1.75/fw.bth dev/olpc/keyboard/selftest.fth Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Wed May 25 23:41:47 2011 (r2224) +++ cpu/arm/olpc/1.75/fw.bth Thu May 26 01:13:22 2011 (r2225) @@ -156,19 +156,6 @@ : close ; end-package -fload ${BP}/dev/logdev.fth -0 value smt-test? \ !!! -0 value final-test? \ !!! -fload ${BP}/cpu/x86/pc/olpc/disptest.fth -fload ${BP}/dev/olpc/keyboard/selftest.fth \ Keyboard diagnostic -fload ${BP}/dev/olpc/touchpad/syntpad.fth \ Touchpad diagnostic -fload ${BP}/cpu/x86/pc/olpc/gridmap.fth \ Gridded display tools -fload ${BP}/cpu/x86/pc/olpc/via/copynand.fth -fload ${BP}/cpu/arm/olpc/1.75/exc7200-touchscreen.fth \ Touchscreen driver and diagnostic - -fload ${BP}/cpu/arm/olpc/1.75/pinch.fth \ Touchscreen gestures -: pinch " pinch" screen-ih $call-method ; - fload ${BP}/cpu/arm/mmp2/keypad.fth [ifndef] cl2-a1 stand-init: keypad @@ -210,6 +197,20 @@ ; fload ${BP}/cpu/x86/pc/olpc/gamekeys.fth + +fload ${BP}/dev/logdev.fth +0 value smt-test? \ !!! +0 value final-test? \ !!! +fload ${BP}/cpu/x86/pc/olpc/disptest.fth +fload ${BP}/dev/olpc/keyboard/selftest.fth \ Keyboard diagnostic +fload ${BP}/dev/olpc/touchpad/syntpad.fth \ Touchpad diagnostic +fload ${BP}/cpu/x86/pc/olpc/gridmap.fth \ Gridded display tools +fload ${BP}/cpu/x86/pc/olpc/via/copynand.fth +fload ${BP}/cpu/arm/olpc/1.75/exc7200-touchscreen.fth \ Touchscreen driver and diagnostic + +fload ${BP}/cpu/arm/olpc/1.75/pinch.fth \ Touchscreen gestures +: pinch " pinch" screen-ih $call-method ; + : emacs ( -- ) false to already-go? boot-getline to boot-file " rom:emacs" $boot Modified: dev/olpc/keyboard/selftest.fth ============================================================================== --- dev/olpc/keyboard/selftest.fth Wed May 25 23:41:47 2011 (r2224) +++ dev/olpc/keyboard/selftest.fth Thu May 26 01:13:22 2011 (r2225) @@ -575,6 +575,97 @@ false ; +\ For XO-1.75, the game buttons are connected directly to the CPU SoC, +\ instead of going through the EC. To preserve the rest of the test +\ logic, we generate a stream of up-down events from the game button +\ mask information. + +0 value pending-scancode \ One-byte queue for scancodes that follow an e0 prefix +0 value pending-buttons \ Bitmask of button changes that haven't been sent yet +0 value last-buttons \ State of game keys the last time we looked + +\ Finds the rightmost one bit in mask +: choose-bit ( mask -- bit# ) + d# 32 0 do ( mask ) + dup 1 and if ( mask ) + drop i unloop exit ( -- bit# ) + then ( mask ) + u2/ ( mask' ) + loop ( mask ) + drop -1 ( bit# ) \ Shouldn't happen +; + +\ Maps bit number to scancode sequence + +create button-scancodes +\ square check up down left right rotate o x +\ 0 1 2 3 4 5 6 7 8 + e067 w, e068 w, 65 w, 66 w, 67 w, 68 w, 69 w, e065 w, e066 w, + +\ If the scancode has an e0 prefix, bit#>scancode returns e0 and puts +\ the suffix scancode in pending-scancode where it will be picked up +\ the next time. +: bit#>scancode ( bit# -- scancode ) + button-scancodes over wa+ w@ ( bit# scancode ) + \ Or in the 80 bit on an "up" transition + 1 rot lshift last-buttons and 0= if ( scancode ) + h# 80 or ( scancode' ) + then ( scancode ) + dup h# ff00 and if ( scancode ) + h# ff and to pending-scancode ( scancode ) + h# e0 ( e0 ) + then ( scancode ) +; + +\ Returns the next button-related scancode byte. +: button-event? ( -- false | scancode true ) + \ Handle the suffix of an e0-scancode sequence + pending-scancode if ( ) + pending-scancode 0 to pending-scancode true ( scancode true ) + exit ( -- scancode true ) + then ( ) + + \ If the pending-buttons change mask is 0, we don't have anymore + \ events to generate from the last time around, so reread the + \ game buttons and set pending-buttons to the ones that have + \ changed. + pending-buttons 0= if + game-key@ ( new-buttons ) + dup last-buttons xor to pending-buttons ( new-buttons ) + to last-buttons ( ) + then + + \ If there are bits set in pending-buttons, generate an event from + \ the leftmost set bit and remove that bit from pending-buttons. + pending-buttons if ( ) + \ Find the rightmost changed bit + pending-buttons choose-bit ( bit# ) + + \ Remove that bit from pending-buttons so it won't be reported again + 1 over lshift invert ( bit# clear-mask ) + pending-buttons and to pending-buttons ( bit# ) + + \ Generate an up or down scancode sequence corresponding to that bit + dup bit#>scancode true ( scancode true ) + else ( ) + false ( false ) + then ( false | scancode true ) +; + +\ Check for a change in button state if necessary. +: or-button? ( [scancode] key? -- [scancode] flag ) + \ If there is already a key from get-data?, handle it before checking the game buttons + dup if exit then ( [scancode] key? phandle ) + + \ If the /ec-spi device node is present, the game buttons are directly connected + \ so we must handle them here. Otherwise the EC will handle them and fold their + \ events into the keyboard scancode stream. + " /ec-spi" find-package if ( false phandle ) + 2drop ( ) + button-event? ( [scancode] flag ) + then ( [scancode] flag ) +; + 0 value last-timestamp : selftest-keys ( -- ) false to esc? @@ -584,8 +675,8 @@ final-test? smt-test? or if key-stuck? if exit then then - get-data? if ( scancode ) - process-raw ( exit? ) + get-data? or-button? if ( scancode ) + process-raw ( exit? ) get-msecs to last-timestamp else final-test? smt-test? or if

1 0

[commit] r2224 - dev
by repository service 25 May '11

25 May '11

Author: wmb Date: Wed May 25 23:41:47 2011 New Revision: 2224 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2224 Log: OLPC trac #10888 - fixed OLPC keyboard test for XO-1.75 for base keyboard. Game buttons still don't test. Modified: dev/pckbd.fth Modified: dev/pckbd.fth ============================================================================== --- dev/pckbd.fth Wed May 25 22:27:40 2011 (r2223) +++ dev/pckbd.fth Wed May 25 23:41:47 2011 (r2224) @@ -525,9 +525,9 @@ headers : open ( -- okay? ) + my-space set-port kbd-refcount @ if 1 +refcnt true exit then unlock - my-space set-port keyboard-present? if clear-out-buf else reset then keyboard-present? 0= if false exit then choose-type

1 0

[commit] r2223 - cpu/x86/pc/biosload
by repository service 25 May '11

25 May '11

Author: wmb Date: Wed May 25 22:27:40 2011 New Revision: 2223 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2223 Log: BIOSload version - Fixed direct BIOS call gateway and used it for VESA BIOS calls, thus enabling the use of VESA framebuffers without needing syslinux. Modified: cpu/x86/pc/biosload/callbios.fth cpu/x86/pc/biosload/callvbe.fth cpu/x86/pc/biosload/fw.bth Modified: cpu/x86/pc/biosload/callbios.fth ============================================================================== --- cpu/x86/pc/biosload/callbios.fth Wed May 25 09:03:39 2011 (r2222) +++ cpu/x86/pc/biosload/callbios.fth Wed May 25 22:27:40 2011 (r2223) @@ -79,7 +79,7 @@ op: pushf op: pusha ds push es push fs push gs push cli - cs ax mov ax ds mov + ax ax xor ax ds mov \ Assumes that the real-mode buffers are in the low 64K op: pm-gdt-save #) lgdt cr0 ax mov 1 # al or ax cr0 mov @@ -151,7 +151,7 @@ \ Video - INT 10 : video-mode ( mode# -- ) - d# 55 set-tick-limit h# 10 bios{ 3 al bx }bios d# 10 set-tick-limit + ( d# 55 set-tick-limit ) h# 10 bios{ 3 al bx }bios ( d# 10 set-tick-limit ) ; : text-mode 3 video-mode ; : 1024x768x8 h# 105 video-mode ; Modified: cpu/x86/pc/biosload/callvbe.fth ============================================================================== --- cpu/x86/pc/biosload/callvbe.fth Wed May 25 09:03:39 2011 (r2222) +++ cpu/x86/pc/biosload/callvbe.fth Wed May 25 22:27:40 2011 (r2223) @@ -1,6 +1,7 @@ \ Call VESA BIOS from a syslinux-loaded ".c32" image \ COM32 arguments are at 0 @ 4 + +[ifndef] bios{ code vesa-mode ( mode# -- ) cx pop @@ -76,6 +77,22 @@ h# 4f01 vbe-call ( ) h# 200 +c32-regs ( adr ) ; +: current-vesa-mode ( -- mode# ) h# 4f03 vbe-call 'c32-bx l@ ; +: set-vesa-mode ( mode# -- ) 'c32-bx w! h# 4f02 vbe-call ; +[else] +h# 2000 constant vesa-rm-buf +: vbe-info ( -- adr ) + vesa-rm-buf ( adr ) + h# 32454256 over l! ( adr ) + h# 10 bios{ dup es:di h# 4f00 ax }bios ( adr ) +; +: vesa-mode-info ( mode# -- adr ) + h# 10 bios{ cx h# 2000 dup es:di h# 4f01 ax }bios ( adr ) +; +: current-vesa-mode ( -- mode# ) h# 10 bios{ h# 4f03 ax }bios bios-bx l@ ; +: set-vesa-mode ( mode# -- ) h# 10 bios{ bx h# 4f02 ax }bios ; +[then] + : .vesa-mode-info ( mode# -- ) push-hex dup 3 u.r space vesa-mode-info >r ( r: adr ) @@ -201,7 +218,5 @@ 3e.l MaxPixelClock [then] -: current-vesa-mode ( -- mode# ) h# 4f03 vbe-call 'c32-bx l@ ; -: set-vesa-mode ( mode# -- ) 'c32-bx w! h# 4f02 vbe-call ; : set-linear-mode ( mode# -- ) h# 4000 or set-vesa-mode ; : vesa-lfb-adr ( mode# -- padr ) h# 4000 or vesa-mode-info h# 28 + l@ ; Modified: cpu/x86/pc/biosload/fw.bth ============================================================================== --- cpu/x86/pc/biosload/fw.bth Wed May 25 09:03:39 2011 (r2222) +++ cpu/x86/pc/biosload/fw.bth Wed May 25 22:27:40 2011 (r2223) @@ -185,6 +185,8 @@ fload ${BP}/cpu/x86/pc/rmtools.fth +fload ${BP}/cpu/x86/pc/biosload/callbios.fth + [ifdef] syslinux-loaded fload ${BP}/cpu/x86/pc/biosload/callvbe.fth [then] @@ -247,7 +249,6 @@ fload ${BP}/cpu/x86/pc/biosload/usb.fth -fload ${BP}/cpu/x86/pc/biosload/callbios.fth \ fload ${BP}/cpu/x86/pc/biosload/rmenter.fth \ false to stand-init-debug? @@ -262,7 +263,7 @@ standalone? if cr ." Type 'i' to interrupt stand-init sequence" cr - d# 2000 ms + d# 1000 ms key? if key upc ascii I = if ." Interacting" cr hex interact then then

1 0

Can't get /pci/display ihandle under vbox&laptop
by 胡松涛 25 May '11

25 May '11

Hi, When I learn http://www.openfirmware.org/1275/practice/#graphics I found that: I Can't get /pci/display ihandle under vbox, when I boot up with usb-disk on my laptop, I can't get ihandle as well. but I can get /pci/vga ihandle under qemu. And it works fine with graphics. -- Hu Songtao works as an English Teacher in weekends Skype: idisblueflash Beijing, China

2 3

[commit] r2222 - cpu/x86/pc/biosload dev/video/controlr
by repository service 25 May '11

25 May '11

Author: wmb Date: Wed May 25 09:03:39 2011 New Revision: 2222 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2222 Log: BIOSload version - added a VESA linear framebuffer driver. Added: dev/video/controlr/vesalfb.fth Modified: cpu/x86/pc/biosload/callvbe.fth cpu/x86/pc/biosload/config-usbkey.fth cpu/x86/pc/biosload/devices.fth cpu/x86/pc/biosload/fw.bth cpu/x86/pc/biosload/ofw.bth Modified: cpu/x86/pc/biosload/callvbe.fth ============================================================================== --- cpu/x86/pc/biosload/callvbe.fth Tue May 24 23:16:47 2011 (r2221) +++ cpu/x86/pc/biosload/callvbe.fth Wed May 25 09:03:39 2011 (r2222) @@ -103,19 +103,54 @@ repeat ( 'mode-list n mode# ) drop nip ( n ) ; -: .vesa-modes ( -- ) +0 value vesa-modes-adr +: vesa-mode-list ( -- adr ) + vesa-modes-adr ?dup if exit then ( ) vbe-info ( adr ) - dup l@ h# 41534556 <> if ( adr ) - ." VBE info call failed" cr - drop exit - then ( adr ) - dup 6 + seg:off@ .cstr cr ( adr ) + dup l@ h# 41534556 <> ( adr flag ) + abort" VBE info call failed" ( adr ) +\ dup 6 + seg:off@ .cstr cr ( adr ) d# 14 + seg:off@ ( 'mode-list ) dup #vesa-modes 1+ ( 'mode-list #modes ) /w* dup alloc-mem ( 'mode-list modes-len adr ) dup >r swap move r> ( adr ) - begin dup w@ dup h# ffff <> while .vesa-mode-info wa1+ repeat cr 2drop + dup to vesa-modes-adr ( adr ) +; +: .vesa-modes ( -- ) + vesa-mode-list + begin ( adr ) + dup w@ dup h# ffff <> ( adr mode# flag ) + exit? 0= and ( adr mode# flag ) + while ( adr mode# ) + .vesa-mode-info wa1+ ( adr' ) + repeat cr ( adr mode# ) + 2drop ( ) +; +: vesa-mode-match? ( x y depth mode# -- x y depth mode# match? ) + dup vesa-mode-info >r ( x y depth mode# r: adr ) + 3 pick r@ h# 12 + w@ <> if ( x y depth mode# r: adr ) + r> drop false exit ( -- x y depth mode# false ) + then ( x y depth mode# r: adr ) + 2 pick r@ h# 14 + w@ <> if ( x y depth mode# r: adr ) + r> drop false exit ( -- x y depth mode# false ) + then ( x y depth mode# r: adr ) + 1 pick r@ h# 19 + c@ <> if ( x y depth mode# r: adr ) + r> drop false exit ( -- x y depth mode# false ) + then ( x y depth mode# r: adr ) + r> drop true ; +: find-vesa-mode ( x y depth -- mode# ) + vesa-mode-list ( x y depth adr ) + begin dup w@ dup h# ffff <> while ( x y depth adr mode# ) + swap >r ( x y depth mode# r: adr ) + vesa-mode-match? if ( x y depth mode# r: adr ) + nip nip nip r> drop ( mode# ) + exit ( -- mode# ) + then ( x y depth mode# r: adr ) + drop r> wa1+ ( x y depth ) + repeat ( x y depth adr ) + 4drop 0 +; [ifdef] Commentary 00.w mode attributes Modified: cpu/x86/pc/biosload/config-usbkey.fth ============================================================================== --- cpu/x86/pc/biosload/config-usbkey.fth Tue May 24 23:16:47 2011 (r2221) +++ cpu/x86/pc/biosload/config-usbkey.fth Wed May 25 09:03:39 2011 (r2222) @@ -17,7 +17,8 @@ \ create virtual-mode create use-root-isa create use-isa-ide -create use-ega +create use-ega \ For text-mode display +\ create use-vesa \ For graphics-mode display create use-elf create use-ne2000 create use-watch-all Modified: cpu/x86/pc/biosload/devices.fth ============================================================================== --- cpu/x86/pc/biosload/devices.fth Tue May 24 23:16:47 2011 (r2221) +++ cpu/x86/pc/biosload/devices.fth Wed May 25 09:03:39 2011 (r2222) @@ -236,6 +236,15 @@ end-package [then] +[ifdef] use-vesa +0 0 " " " /" begin-package + " display" name + " vesa" " compatible" string-property + fload ${BP}/dev/video/controlr/vesalfb.fth +end-package +devalias screen /display \ Explicit, because it's not probed +[then] + [ifdef] use-ct65550 0 0 " i3b0" " /isa" begin-package fload ${BP}/dev/ct6555x/loadpkg.fth \ Video driver Modified: cpu/x86/pc/biosload/fw.bth ============================================================================== --- cpu/x86/pc/biosload/fw.bth Tue May 24 23:16:47 2011 (r2221) +++ cpu/x86/pc/biosload/fw.bth Wed May 25 09:03:39 2011 (r2222) @@ -183,6 +183,12 @@ [then] [then] +fload ${BP}/cpu/x86/pc/rmtools.fth + +[ifdef] syslinux-loaded +fload ${BP}/cpu/x86/pc/biosload/callvbe.fth +[then] + fload ${BP}/cpu/x86/pc/biosload/devices.fth fload ${BP}/dev/scsi/probscsi.fth \ probe-scsi and probe-scsi-all @@ -240,14 +246,10 @@ ; fload ${BP}/cpu/x86/pc/biosload/usb.fth -fload ${BP}/cpu/x86/pc/rmtools.fth + fload ${BP}/cpu/x86/pc/biosload/callbios.fth \ fload ${BP}/cpu/x86/pc/biosload/rmenter.fth -[ifdef] syslinux-loaded -fload ${BP}/cpu/x86/pc/biosload/callvbe.fth -[then] - \ false to stand-init-debug? true to stand-init-debug? Modified: cpu/x86/pc/biosload/ofw.bth ============================================================================== --- cpu/x86/pc/biosload/ofw.bth Tue May 24 23:16:47 2011 (r2221) +++ cpu/x86/pc/biosload/ofw.bth Wed May 25 09:03:39 2011 (r2222) @@ -157,6 +157,9 @@ [ifdef] use-vga " ${BP}/ofw/termemu/cp881-16.obf" " font" $add-deflated-dropin [then] +[ifdef] use-vesa + " ${BP}/ofw/termemu/cp881-16.obf" " font" $add-deflated-dropin +[then] [ifdef] grub-loaded ofd @ fsize h# 60 - pad ! \ file size; store in memory for convenience below Added: dev/video/controlr/vesalfb.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ dev/video/controlr/vesalfb.fth Wed May 25 09:03:39 2011 (r2222) @@ -0,0 +1,130 @@ +\ See license at end of file +purpose: Display driver for VESA linear framebuffer + +d# 640 instance value width \ Active screen width +d# 480 instance value height \ Active screen height +d# 32 instance value depth +d# 640 4 * instance value /scanline \ Active screen width +: (set-resolution) ( width height depth -- ) + to depth to height to width + width depth 8 / * to /scanline +; + +0 value mode# +0 value old-mode# +: set-vesa-resolution ( -- ) + mode# vesa-mode-info + dup h# 10 + w@ to /scanline + dup h# 12 + w@ to width + dup h# 14 + w@ to height + h# 19 + c@ to depth +; +: fb-size ( -- len ) + height /scanline * h# 1000 round-up +; + +h# 200.0000 instance value /mem +: map-mem ( -- ) + mode# vesa-lfb-adr fb-size " map-in" $call-parent to frame-buffer-adr +; +: unmap-mem ( -- ) + frame-buffer-adr fb-size " map-out" $call-parent +; + +headers + +: declare-props ( -- ) \ Instantiate screen properties + " width" get-my-property if + width encode-int " width" property + height encode-int " height" property + depth encode-int " depth" property + /scanline encode-int " linebytes" property + else + 2drop + then +; + +: choose-mode ( -- ) + mode# if exit then + \ Lower-resolution modes scroll faster. 32-bit often works better than 16 + d# 640 d# 480 d# 32 find-vesa-mode ?dup if to mode# exit then + d# 640 d# 480 d# 16 find-vesa-mode ?dup if to mode# exit then + d# 800 d# 600 d# 32 find-vesa-mode ?dup if to mode# exit then + d# 800 d# 600 d# 16 find-vesa-mode ?dup if to mode# exit then + d# 1024 d# 768 d# 32 find-vesa-mode ?dup if to mode# exit then + d# 1024 d# 768 d# 16 find-vesa-mode ?dup if to mode# exit then + d# 1280 d# 1024 d# 32 find-vesa-mode ?dup if to mode# exit then + d# 1280 d# 1024 d# 16 find-vesa-mode ?dup if to mode# exit then + -1 throw +; +: init ( -- ) + current-vesa-mode to old-mode# + choose-mode + set-vesa-resolution + mode# set-linear-mode + map-mem + declare-props +; + +: init-hook ( -- ) ; +: display-remove ( -- ) unmap-mem old-mode# set-vesa-mode ; + +hex +headers + +" display" device-type +" ISO8859-1" encode-string " character-set" property +0 0 encode-bytes " iso6429-1983-colors" property + +: display-selftest ( -- failed? ) false ; + +: display-install ( -- ) + init + default-font set-font + width height over char-width / over char-height / + /scanline depth " fb-install" eval + +; + +' display-install is-install +' display-remove is-remove +' display-selftest is-selftest + +\ We could use the hardware blitter but it's hardly worth the effort. +\ Modern CPUs can pump bits into memory at a blistering rate. + +fload ${BP}/dev/video/common/rectangle16.fth + +: save-rectangle ( n x y w h -- x w y h n x y w h ) + 4 roll >r ( x y w h r: n ) + swap -rot ( x w y h r: n ) + r> ( x w y h n ) + 4 pick 3 pick ( x w y h n x y ) + 5 pick 4 pick ( x w y h n x y w h ) +; + +: text-mode3 ( -- ) 3 set-vesa-mode ; \ Disable SVGA, thus reverting to text mode + +\ LICENSE_BEGIN +\ Copyright (c) 2011 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END

1 0

[commit] r2221 - dev
by repository service 24 May '11

24 May '11

Author: wmb Date: Tue May 24 23:16:47 2011 New Revision: 2221 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2221 Log: Marvell "libertas" WLAN driver - Retries after failure to associate were crashing instead of retrying. Modified: dev/libertas.fth Modified: dev/libertas.fth ============================================================================== --- dev/libertas.fth Tue May 24 23:12:36 2011 (r2220) +++ dev/libertas.fth Tue May 24 23:16:47 2011 (r2221) @@ -1469,11 +1469,13 @@ then ( ch ssid$ target-mac$ ) ?set-wep \ Set WEP keys again, if ktype is WEP set-mac-control - 2dup authenticate - d# 10 0 do - bss-type bss-type-managed = if (associate) else (join) then ( ok? ) - if true unloop exit then + 2dup authenticate ( ch ssid$ target-mac$ ) + d# 10 0 do ( ch ssid$ target-mac$ ) + 4 pick 4 pick 4 pick 4 pick 4 pick ( ch ssid$ target-mac$ ch ssid$ target-mac$ ) + bss-type bss-type-managed = if (associate) else (join) then ( ch ssid$ target-mac$ ok? ) + if 2drop 3drop true unloop exit then loop + 2drop 3drop false ; headers

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware May 2011