openfirmware

openfirmware@openfirmware.info

3007 discussions

r1332 - cpu/x86/pc
by svn＠openfirmware.info 28 Aug '09

28 Aug '09

Author: wmb Date: 2009-08-28 22:03:29 +0200 (Fri, 28 Aug 2009) New Revision: 1332 Modified: cpu/x86/pc/resetend.fth Log: resetend.fth - fixed GDT copying problem that was breaking the GRUB-loaded variant. Modified: cpu/x86/pc/resetend.fth =================================================================== --- cpu/x86/pc/resetend.fth 2009-08-27 18:53:11 UTC (rev 1331) +++ cpu/x86/pc/resetend.fth 2009-08-28 20:03:29 UTC (rev 1332) @@ -10,21 +10,26 @@ \ the pointer since 0 is an invalid descriptor number anyway. gdt-pa # ax mov 0 [ax] sgdt \ Read GDT - 2 [ax] si mov \ GDT base + 2 [ax] bx mov \ GDT base 0 [ax] cx mov \ GDT limit ffff # cx and cx inc + gdt-size # cx cmp u> if + gdt-size # cx mov + then + + bx si mov \ Source address for copy - old GDT gdt-pa # di mov \ New GDT base - rep movsb \ Copy ROM GDT to RAM + rep movsb \ Copy old GDT to new GDT \ Move the code and data descriptors to 60,68 gdt-pa h# 60 + # di mov \ Destination - New descriptor 0x60 - cs si mov 2 [ax] si add \ Source - Current code descriptor + cs si mov bx si add \ Source - Current code descriptor movs movs \ 2 longwords (1 descriptor) -> 60 - ds si mov 2 [ax] si add \ Source - Current data descriptor + ds si mov bx si add \ Source - Current data descriptor movs movs \ 2 longwords (1 descriptor) -> 68 op: gdt-size 1- # 0 [ax] mov \ New GDT size

1 0

r1331 - ofw/core
by svn＠openfirmware.info 27 Aug '09

27 Aug '09

Author: wmb Date: 2009-08-27 20:53:11 +0200 (Thu, 27 Aug 2009) New Revision: 1331 Modified: ofw/core/muxdev.fth Log: Muxdev - propagate the ring-bell method. Modified: ofw/core/muxdev.fth =================================================================== --- ofw/core/muxdev.fth 2009-08-26 23:54:20 UTC (rev 1330) +++ ofw/core/muxdev.fth 2009-08-27 18:53:11 UTC (rev 1331) @@ -12,6 +12,7 @@ /n field >ihandle /n field >read /n field >write + /n field >bell constant /list-node : read ( adr len -- actual ) @@ -40,6 +41,17 @@ repeat ( adr len listnode ) drop nip ; +: ring-bell ( -- ) + first-device @ + begin dup while ( listnode ) + >r ( ) + r@ >bell @ ?dup if ( xt ) + r@ >ihandle @ call-package ( ) + then ( ) + r> >link @ ( listnode' ) + repeat ( listnode ) + drop +; : show-devices ( -- ) first-device @ @@ -61,13 +73,16 @@ ihandle>phandle ( phandle r: listnode ) - " read" 2 pick find-method 0= if 0 then ( phandle xt r: listnode ) + " read" third find-method 0= if 0 then ( phandle xt r: listnode ) r@ >read ! - " write" 2 pick find-method 0= if 0 then ( phandle xt r: listnode ) + " write" third find-method 0= if 0 then ( phandle xt r: listnode ) r@ >write ! ( phandle r: listnode ) - " install-abort" 2 pick find-method if ( phandle xt r: listnode ) + " ring-bell" third find-method 0= if 0 then ( phandle xt r: listnode ) + r@ >bell ! ( phandle r: listnode ) + + " install-abort" third find-method if ( phandle xt r: listnode ) r@ >ihandle @ call-package ( phandle r: listnode ) then ( phandle r: listnode )

1 0

r1330 - dev/olpc/dcon
by svn＠openfirmware.info 26 Aug '09

26 Aug '09

Author: wmb Date: 2009-08-27 01:54:20 +0200 (Thu, 27 Aug 2009) New Revision: 1330 Modified: dev/olpc/dcon/viadcon.fth Log: Via - re-establish 2D graphics accelerator setup in video-restore, so scrolling works correctly upon resume from S3. Modified: dev/olpc/dcon/viadcon.fth =================================================================== --- dev/olpc/dcon/viadcon.fth 2009-08-25 07:10:54 UTC (rev 1329) +++ dev/olpc/dcon/viadcon.fth 2009-08-26 23:54:20 UTC (rev 1330) @@ -185,6 +185,7 @@ smb-init dcon-gpio-init olpc-lcd-mode + gp-setup 1 set-source \ Unfreeze image ;

1 0

problem with GRUB loaded version
by Dompi 26 Aug '09

26 Aug '09

Hi all, When trying to build the GRUB loaded flavor of OpenFirnware ( SVN rev 1320 ) i got the following error message during the build process dompi@OMEGA:~/ofw/cpu/x86/pc/biosload/build$ make ./build ofw.c32 --- Rebuilding reset.di --- Cmd: ${HOSTDIR}/forth ${HOSTDIR}/../build/builder.dic ../reset.bth --- Rebuilding start.di --- Cmd: ${HOSTDIR}/forth ${HOSTDIR}/../build/builder.dic ../start.bth --- Rebuilding paging.di --- Cmd: ${HOSTDIR}/forth ${HOSTDIR}/../build/builder.dic ../paging.bth --- Rebuilding bootsec.hex --- Cmd: ${HOSTDIR}/forth ${HOSTDIR}/../build/builder.dic ../bootsec.bth 1fe 1f0 400 400 --- Rebuilding fw.img --- Cmd: ${HOSTDIR}/x86forth ${BP}/cpu/x86/build/basefw.dic ../fw.bth SAVING FW.dic ... Saving fw.img ... --- Rebuilding sd8686.bin --- Cmd: ${HOSTDIR}/forth ${HOSTDIR}/../build/builder.dic ../sd8686.bth --- Cmd: rm -f sd8686.bin sd8686_helper.bin --- Cmd: wget -q http://dev.laptop.org/pub/firmware/libertas/sd8686-9.70.7.p0.bin --- Cmd: wget -q http://dev.laptop.org/pub/firmware/libertas/sd8686-9.70.7.p0.bin.md5 --- Cmd: md5sum -b sd8686-9.70.7.p0.bin | cmp - sd8686-9.70.7.p0.bin.md5 --- Cmd: mv sd8686-9.70.7.p0.bin sd8686.bin --- Cmd: wget -q http://dev.laptop.org/pub/firmware/libertas/sd8686_helper.bin --- Cmd: wget -q http://dev.laptop.org/pub/firmware/libertas/sd8686_helper.bin.md5 --- Cmd: md5sum -b sd8686_helper.bin | cmp - sd8686_helper.bin.md5 --- Cmd: rm sd8686-9.70.7.p0.bin.md5 sd8686_helper.bin.md5 --- Rebuilding ofw.c32 --- Cmd: ${HOSTDIR}/forth ${HOSTDIR}/../build/builder.dic ../ofw.bth --- Saving as ofwgrub.elf - GRUB multiboot format Can't open ${BP}/dev/mmc/sdhci/build/sdhci.fc for reading. make: *** [ofw.c32] Erreur 1 After replacing sdhci.fc wiith sdhci2.fc ( line 105 in ofw.bth ) the build was successfull. But that was not the story end : when loaded by GRUB the image crashed badly with a black screen followed by a reboot. Looking at the code i noticed the report mecanism that outputs progress messages on the COM1 port. With rev 1320 i got the following pattern : For With rev 1163 ( which is OK ) i got the regular Forthmacs banner. It seems to me that the paging module is not executing at all with a crash as a consequence. I built rev 1166 which introduced lot of changes in resetend.fth and in the memory setup it also crashes. I would appreciate any help as i am stuck at the moment. Dompi.

2 2

r1329 - cpu/x86 dev dev/olpc/touchpad ofw/gui ofw/termemu
by svn＠openfirmware.info 25 Aug '09

25 Aug '09

Author: wmb Date: 2009-08-25 09:10:54 +0200 (Tue, 25 Aug 2009) New Revision: 1329 Modified: cpu/x86/fb8-ops.fth dev/olpc/touchpad/touchpad.fth dev/ps2mouse.fth ofw/gui/button.fth ofw/gui/graphics.fth ofw/gui/iconmenu.fth ofw/gui/mouse.fth ofw/termemu/fb8.fth ofw/termemu/framebuf.fth Log: Via - Made the mouse work for the selftest menu. Modified: cpu/x86/fb8-ops.fth =================================================================== --- cpu/x86/fb8-ops.fth 2009-08-25 04:37:54 UTC (rev 1328) +++ cpu/x86/fb8-ops.fth 2009-08-25 07:10:54 UTC (rev 1329) @@ -406,6 +406,64 @@ 8 /n* # sp add c; +code fb8-merge ( color bits dst-adr width -- ) + cx pop \ CX: width + dx pop \ DX: adr + bx pop \ BX: bits + ax pop \ AX: color + di push \ Save DI + dx di mov \ DI: adr + ax dx mov \ DX: color + begin + bx bx add \ Shift out high bit + carry? if + al stos + else + di inc + then + loopa + di pop \ Restore DI +c; + +code fb16-merge ( color bits dst-adr width -- ) + cx pop \ CX: width + dx pop \ DX: adr + bx pop \ BX: bits + ax pop \ AX: color + di push \ Save DI + dx di mov \ DI: adr + ax dx mov \ DX: color + begin + bx bx add \ Shift out high bit + carry? if + op: ax stos + else + 2 [di] di lea + then + loopa + di pop \ Restore DI +c; + +code fb32-merge ( color bits dst-adr width -- ) + cx pop \ CX: width + dx pop \ DX: adr + bx pop \ BX: bits + ax pop \ AX: color + di push \ Save DI + dx di mov \ DI: adr + ax dx mov \ DX: color + begin + bx bx add \ Shift out high bit + carry? if + ax stos + else + 4 [di] di lea + then + loopa + di pop \ Restore DI +c; + + headers \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks Modified: dev/olpc/touchpad/touchpad.fth =================================================================== --- dev/olpc/touchpad/touchpad.fth 2009-08-25 04:37:54 UTC (rev 1328) +++ dev/olpc/touchpad/touchpad.fth 2009-08-25 07:10:54 UTC (rev 1329) @@ -55,12 +55,6 @@ \ get-data waits for and reads a data byte -\ The normal mouse driver uses remote mode, but this device -\ doesn't support remote mode, so patch the mouse driver -\ "open" routine to substitute "noop" for "remote-mode". - -patch noop remote-mode open - variable ptr 0 value show-raw? @@ -117,6 +111,13 @@ then ; +\ The normal mouse driver uses remote mode, but this device +\ doesn't support remote mode, so patch the mouse driver +\ "open" routine to substitute "noop" for "remote-mode". + +patch start remote-mode open + + \ I have been unable to get this to work. The response is always \ 64 0 <something>, which doesn't agree with the spec. \ Perhaps the touchpad version that I have doesn't implement the, Modified: dev/ps2mouse.fth =================================================================== --- dev/ps2mouse.fth 2009-08-25 04:37:54 UTC (rev 1328) +++ dev/ps2mouse.fth 2009-08-25 07:10:54 UTC (rev 1329) @@ -313,10 +313,16 @@ dup if clear-out-buf then ( error? ) ; +0 value open-count + headers : open ( -- flag ) 1 set-port + open-count 1+ to open-count + + open-count 1 <> if true exit then + \ The "force" argument causes the open to succeed even if no mouse \ is present my-args [char] , left-parse-string 2swap 2drop " force" $= if @@ -331,7 +337,10 @@ remote-mode true ; -: close ( -- ) stream-off ; +: close ( -- ) + open-count 1 = if stream-off then + open-count 1- 0 max to open-count +; headerless \ Filter out large negative motions; they're probably spurious Modified: ofw/gui/button.fth =================================================================== --- ofw/gui/button.fth 2009-08-25 04:37:54 UTC (rev 1328) +++ ofw/gui/button.fth 2009-08-25 07:10:54 UTC (rev 1329) @@ -218,7 +218,7 @@ def-alert-col-row alert-text-box center-text key drop restore-rectangle ; : setup ( -- ) - screen-ih 0= if open-devices set-menu-colors then + ?open-screen set-menu-colors ?open-mouse clear-menu install-menu cursor-off refresh ; [then] Modified: ofw/gui/graphics.fth =================================================================== --- ofw/gui/graphics.fth 2009-08-25 04:37:54 UTC (rev 1328) +++ ofw/gui/graphics.fth 2009-08-25 07:10:54 UTC (rev 1329) @@ -40,6 +40,7 @@ ; : $call-screen ( ??? adr len -- ??? ) screen-ih $call-method ; +: screen-execute ( ?? xt -- ?? ) screen-ih package( execute )package ; \ : screen-wh ( -- x y ) \ screen-ih package( screen-width screen-height )package @@ -68,9 +69,8 @@ " set-colors" $call-screen ; -: bytes/pixel ( -- n ) " depth" $call-screen 8 / ; -: alloc-pixels ( #pixels -- adr ) bytes/pixel * alloc-mem ; -: free-pixels ( adr #pixels -- ) bytes/pixel * free-mem ; +: alloc-pixels ( #pixels -- adr ) ['] pix* screen-execute alloc-mem ; +: free-pixels ( adr #pixels -- ) ['] pix* screen-execute free-mem ; : fill-rectangle ( color x y w h - ) ?inset " fill-rectangle" $call-screen Modified: ofw/gui/iconmenu.fth =================================================================== --- ofw/gui/iconmenu.fth 2009-08-25 04:37:54 UTC (rev 1328) +++ ofw/gui/iconmenu.fth 2009-08-25 07:10:54 UTC (rev 1329) @@ -416,17 +416,21 @@ bb bb bb 15 set-color \ Bright gray for CD-ROM icon ; -: open-devices ( -- ) - " screen" open-dev is screen-ih +: ?open-screen ( -- ) + screen-ih 0= if + " screen" open-dev is screen-ih + then +; +: ?open-mouse ( -- ) mouse-ih 0= if - " mouse" open-dev to mouse-ih \ Try alias first + " mouse" open-dev is mouse-ih mouse-ih 0= if " /mouse" open-dev to mouse-ih then - alloc-mouse-cursor + mouse-ih if alloc-mouse-cursor then then ; - + true config-flag menu? 0 value default-selection @@ -468,7 +472,7 @@ ; : setup-graphics ( -- ) - screen-ih 0= if open-devices set-menu-colors then + ?open-screen set-menu-colors ?open-mouse ; : setup-menu ( -- ) setup-graphics Modified: ofw/gui/mouse.fth =================================================================== --- ofw/gui/mouse.fth 2009-08-25 04:37:54 UTC (rev 1328) +++ ofw/gui/mouse.fth 2009-08-25 07:10:54 UTC (rev 1329) @@ -18,6 +18,7 @@ \ ' move-cursor is handle-movement \ mouse position is kept in values x and y +0 [if] d# 16 constant cursor-w d# 16 constant cursor-h @@ -36,34 +37,93 @@ 78000000 , 58000000 , 0c000000 , 0c000000 , \ 04000000 , 06000000 , 02000000 , 00000000 , 06000000 , 06000000 , 00000000 , 00000000 , +[else] +d# 17 constant cursor-w +d# 31 constant cursor-h -: merge-line ( color mask adr -- ) - cursor-w bounds ?do ( color mask ) - dup h# 80000000 and if over i c! then ( color mask ) - 2* ( color mask' ) - loop - 2drop -; -: merge-rect ( color mask-adr rect-adr -- ) - cursor-h 0 do ( color mask-adr rect-adr ) - 3dup swap @ swap merge-line - swap na1+ swap cursor-w + - loop - 3drop -; +create white-bits +binary + 11000000000000000000000000000000 , + 11100000000000000000000000000000 , + 11011000000000000000000000000000 , + 11001100000000000000000000000000 , + 11000110000000000000000000000000 , + 11000011000000000000000000000000 , + 11000001100000000000000000000000 , + 11000000110000000000000000000000 , + 11000000011000000000000000000000 , + 11000000001100000000000000000000 , + 11000000000110000000000000000000 , + 11000000000011000000000000000000 , + 11000000000001100000000000000000 , + 11000000000000110000000000000000 , + 11000000000000011000000000000000 , + 11000000000000001100000000000000 , + 11000000000111111000000000000000 , + 11000000000011000000000000000000 , + 11000110000011000000000000000000 , + 11001110000001100000000000000000 , + 11010011000001100000000000000000 , + 11100011000000110000000000000000 , + 00000001100000110000000000000000 , + 00000001100000011000000000000000 , + 00000000110000011000000000000000 , + 00000000110000001100000000000000 , + 00000000011000001100000000000000 , + 00000000011000000110000000000000 , + 00000000001100011000000000000000 , + 00000000000111110000000000000000 , + 00000000000111110000000000000000 , +create black-bits + 00000000000000000000000000000000 , + 00000000000000000000000000000000 , + 00100000000000000000000000000000 , + 00110000000000000000000000000000 , + 00111000000000000000000000000000 , + 00111100000000000000000000000000 , + 00111110000000000000000000000000 , + 00111111000000000000000000000000 , + 00111111100000000000000000000000 , + 00111111110000000000000000000000 , + 00111111111000000000000000000000 , + 00111111111100000000000000000000 , + 00111111111110000000000000000000 , + 00111111111111000000000000000000 , + 00111111111111100000000000000000 , + 00111111111111110000000000000000 , + 00111111111000000000000000000000 , + 00111111111100000000000000000000 , + 00111001111100000000000000000000 , + 00110001111110000000000000000000 , + 00100000111110000000000000000000 , + 00000000111111000000000000000000 , + 00000000011111000000000000000000 , + 00000000011111100000000000000000 , + 00000000001111100000000000000000 , + 00000000001111110000000000000000 , + 00000000000111110000000000000000 , + 00000000000111110000000000000000 , + 00000000000011100000000000000000 , + 00000000000000000000000000000000 , + 00000000000000000000000000000000 , +hex +[then] + + + 0 value /rect 0 value old-rect 0 value new-rect : alloc-mouse-cursor ( -- ) - cursor-w cursor-h * bytes/pixel * to /rect + cursor-w cursor-h * ['] pix* screen-execute to /rect cursor-w cursor-h * alloc-pixels to old-rect cursor-w cursor-h * alloc-pixels to new-rect ; : merge-cursor ( -- ) - 0f white-bits new-rect merge-rect - 00 black-bits new-rect merge-rect + background white-bits new-rect cursor-w cursor-h ['] merge-rect screen-execute + black black-bits new-rect cursor-w cursor-h ['] merge-rect screen-execute ; : put-cursor ( x y adr -- ) @@ -88,7 +148,7 @@ : update-position ( x y -- ) 2dup or 0= if 2drop exit then \ Avoid flicker if there is no movement - \ Minimize the time the cursor is down by doing computation in advance + \ Minimize the time the cursor is down by doing computa1000000000000000000 ,tion in advance \ Considering the amount of code that is executed to put up the cursor, \ this optimization is probable unnoticeable, but it doesn't cost much. negate ypos + 0 max-y cursor-h - clamp ( x y' ) Modified: ofw/termemu/fb8.fth =================================================================== --- ofw/termemu/fb8.fth 2009-08-25 04:37:54 UTC (rev 1328) +++ ofw/termemu/fb8.fth 2009-08-25 07:10:54 UTC (rev 1329) @@ -240,6 +240,48 @@ bytes/line + ( #bytes adr' ) loop 2drop ( ) ; + +[ifndef] fb8-merge +: fb8-merge ( color bits dst-adr width -- ) + bounds ?do ( color mask ) + dup h# 80000000 and if ( color mask ) + over i c! ( color mask ) + then ( color mask ) + 2* ( color mask' ) + loop ( color mask ) + 2drop ( ) +; +: fb16-merge ( color bits dst-adr width -- ) + cursor-w /w* bounds ?do ( color mask ) + dup h# 80000000 and if ( color mask ) + over i w! ( color mask ) + then ( color mask ) + 2* ( color mask' ) + /w +loop ( color mask ) + 2drop ( ) +; +: fb32-merge ( color bits dst-adr width -- ) + cursor-w /l* bounds ?do ( color mask ) + dup h# 80000000 and if ( color mask ) + over i l! ( color mask ) + then ( color mask ) + 2* ( color mask' ) + /l +loop ( color mask ) + 2drop ( ) +; +[then] + +\ This is used for cursor painting. Call it via screen-execute + +: merge-rect ( color mask-adr dst-adr width height -- ) + 0 ?do ( color mask-adr rect-adr width ) + 2over @ 2over fb-merge ( color mask-adr rect-adr width ) + rot na1+ -rot ( color mask-adr' rect-adr width ) + tuck pix* + swap ( color mask-adr rect-adr' width ) + loop + 4drop +; + headers : fb8-insert-characters ( #chars -- ) #columns column# - min dup @@ -251,6 +293,7 @@ column# + column# ( #chars' cursor+count-col# cursor-col# ) move-chars ( #chars' ) #columns over - erase-chars ; + headerless : center-display ( -- ) @@ -266,6 +309,7 @@ ['] fb8-invert to fb-invert ['] fill to fb-fill ['] fb8-paint to fb-paint + ['] fb8-merge to fb-merge ['] colors-8bpp to fb-16map endof @@ -274,6 +318,7 @@ ['] fb16-invert to fb-invert ['] wfill to fb-fill ['] fb16-paint to fb-paint + ['] fb16-merge to fb-merge ['] colors-565 to fb-16map endof @@ -282,6 +327,7 @@ ['] fb32-invert to fb-invert ['] lfill to fb-fill ['] fb32-paint to fb-paint + ['] fb32-merge to fb-merge ['] colors-32bpp to fb-16map endof endcase Modified: ofw/termemu/framebuf.fth =================================================================== --- ofw/termemu/framebuf.fth 2009-08-25 04:37:54 UTC (rev 1328) +++ ofw/termemu/framebuf.fth 2009-08-25 07:10:54 UTC (rev 1329) @@ -76,6 +76,7 @@ termemu-defer fb-fill termemu-defer fb-paint termemu-defer fb-16map +termemu-defer fb-merge termemu-defer draw-character termemu-defer insert-characters

1 0

r1328 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 25 Aug '09

25 Aug '09

Author: rsmith Date: 2009-08-25 06:37:54 +0200 (Tue, 25 Aug 2009) New Revision: 1328 Modified: cpu/x86/pc/olpc/via/versions.fth Log: OLPC: Bump version to q3a10 Modified: cpu/x86/pc/olpc/via/versions.fth =================================================================== --- cpu/x86/pc/olpc/via/versions.fth 2009-08-25 04:36:50 UTC (rev 1327) +++ cpu/x86/pc/olpc/via/versions.fth 2009-08-25 04:37:54 UTC (rev 1328) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 09b +macro: FW_MINOR 10 \ The EC microcode macro: EC_VERSION 1_9_9

1 0

r1327 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 25 Aug '09

25 Aug '09

Author: rsmith Date: 2009-08-25 06:36:50 +0200 (Tue, 25 Aug 2009) New Revision: 1327 Modified: cpu/x86/pc/olpc/via/dsdt.dsl Log: OLPC: Fixup the ACPI C state table to enable C4. ACPI only knows about states up to C3 so the ID value of all states >= C3 needs to be C3. The validator code in linux will fail to validate anything thats not C1-C3. The additional states are assumed by virtue of there being additional entries in the CST table. Modified: cpu/x86/pc/olpc/via/dsdt.dsl =================================================================== --- cpu/x86/pc/olpc/via/dsdt.dsl 2009-08-25 03:09:56 UTC (rev 1326) +++ cpu/x86/pc/olpc/via/dsdt.dsl 2009-08-25 04:36:50 UTC (rev 1327) @@ -98,11 +98,10 @@ { Name(_CST, Package() { - 4, + 3, Package(){ResourceTemplate(){Register(SystemIO, 8, 0, 0x414)}, 2, 2, 750}, Package(){ResourceTemplate(){Register(SystemIO, 8, 0, 0x415)}, 3, 65, 500}, - Package(){ResourceTemplate(){Register(SystemIO, 8, 0, 0x416)}, 4, 100, 300}, - Package(){ResourceTemplate(){Register(SystemIO, 8, 0, 0x417)}, 5, 200, 200} + Package(){ResourceTemplate(){Register(SystemIO, 8, 0, 0x416)}, 3, 100, 300}, }) } }

1 0

r1326 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 25 Aug '09

25 Aug '09

Author: wmb Date: 2009-08-25 05:09:56 +0200 (Tue, 25 Aug 2009) New Revision: 1326 Modified: cpu/x86/pc/olpc/via/versions.fth Log: Via - Use EC code version 1.9.9 Modified: cpu/x86/pc/olpc/via/versions.fth =================================================================== --- cpu/x86/pc/olpc/via/versions.fth 2009-08-25 03:04:49 UTC (rev 1325) +++ cpu/x86/pc/olpc/via/versions.fth 2009-08-25 03:09:56 UTC (rev 1326) @@ -2,10 +2,10 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 09 +macro: FW_MINOR 09b \ The EC microcode -macro: EC_VERSION 1_9_8 +macro: EC_VERSION 1_9_9 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary

1 0

r1325 - cpu/x86/pc/olpc/via dev/video/common ofw/gui
by svn＠openfirmware.info 25 Aug '09

25 Aug '09

Author: wmb Date: 2009-08-25 05:04:49 +0200 (Tue, 25 Aug 2009) New Revision: 1325 Added: cpu/x86/pc/olpc/via/mfgtest.fth cpu/x86/pc/olpc/via/testicons.bth cpu/x86/pc/olpc/via/testicons.tgz Modified: cpu/x86/pc/olpc/via/fw.bth cpu/x86/pc/olpc/via/olpc.bth dev/video/common/rectangle16.fth ofw/gui/bmp24rgb565.fth ofw/gui/graphics.fth ofw/gui/iconmenu.fth ofw/gui/menumisc.fth ofw/gui/rgb565bmp24.fth Log: Via - added graphical selftest menu from Luke Gorrie. Modified: cpu/x86/pc/olpc/via/fw.bth =================================================================== --- cpu/x86/pc/olpc/via/fw.bth 2009-08-24 23:02:25 UTC (rev 1324) +++ cpu/x86/pc/olpc/via/fw.bth 2009-08-25 03:04:49 UTC (rev 1325) @@ -307,7 +307,7 @@ fload ${BP}/ofw/gui/loadmenu.fth fload ${BP}/ofw/gui/insticon.fth -\ fload ${BP}/cpu/x86/pc/olpc/via/mfgtest.fth +fload ${BP}/cpu/x86/pc/olpc/via/mfgtest.fth : screen-#lines ( -- n ) screen-ih 0= if default-#lines exit then Added: cpu/x86/pc/olpc/via/mfgtest.fth =================================================================== --- cpu/x86/pc/olpc/via/mfgtest.fth (rev 0) +++ cpu/x86/pc/olpc/via/mfgtest.fth 2009-08-25 03:04:49 UTC (rev 1325) @@ -0,0 +1,191 @@ +\ See license at end of file +purpose: Menu for manufacturing tests + +h# f800 constant color-red +h# 07e0 constant color-green + +: flush-keyboard ( -- ) begin key? while key drop repeat ; + +: sq-border! ( bg -- ) current-sq sq >border ! ; + +: red-screen ( -- ) h# ffff color-red " replace-color16" $call-screen ; +: green-screen ( -- ) h# ffff color-green " replace-color16" $call-screen ; + +0 value pass? + +: mfg-test-dev ( $ -- ) + restore-scroller + find-device + ??cr ." Testing " pwd + " selftest" current-device execute-phandle-method ( return abort? ) + if + ?dup if + ??cr ." Selftest failed. Return code = " .d cr + color-red sq-border! + false to pass? + red-screen + flush-keyboard + wait-return + else + green-letters + ." Okay" cr + black-letters + color-green sq-border! + true to pass? + d# 2000 hold-message + then + else + ." Selftest failed due to abort" cr + color-red sq-border! + false to pass? + red-screen + flush-keyboard + wait-return + then + cursor-off gui-alerts refresh + flush-keyboard +; + +: draw-error-border ( -- ) + color-red d# 20 d# 20 d# 1160 d# 820 d# 20 box +; + +icon: play.icon rom:play.565 +icon: quit.icon rom:quit.565 +icon: cpu.icon rom:cpu.565 +icon: spi.icon rom:spi.565 +icon: ram.icon rom:ram.565 +icon: sdcard.icon rom:sdcard.565 +icon: usb.icon rom:usb.565 +icon: battery.icon rom:battery.565 +icon: camera.icon rom:camera.565 +icon: wifi.icon rom:wifi.565 +icon: audio.icon rom:audio.565 +icon: touchpad.icon rom:touchpad.565 +icon: display.icon rom:display.565 +icon: keyboard.icon rom:keyboard.565 +icon: timer.icon rom:timer.565 +icon: clock.icon rom:clock.565 + +: all-tests-passed ( -- ) + restore-scroller + clear-screen + ." All automatic tests passed successfully." cr cr cr + green-screen + wait-return + cursor-off gui-alerts refresh + flush-keyboard +; + +d# 14 value #mfgtests + +: play-item ( -- ) + 5 #mfgtests + 5 do + i set-current-sq + refresh + d# 200 0 do + d# 10 ms key? if unloop unloop exit then + loop + doit + pass? 0= if unloop exit then + loop + all-tests-passed +; +: quit-item ( -- ) menu-done ; +: cpu-item ( -- ) " /cpu" mfg-test-dev ; +: battery-item ( -- ) " /battery" mfg-test-dev ; +: flash-item ( -- ) " /flash" mfg-test-dev ; +: memory-item ( -- ) " /memory" mfg-test-dev ; +: usb-item ( -- ) " /usb" mfg-test-dev ; +: sd-item ( -- ) " /sd/disk:0" mfg-test-dev ; +: rtc-item ( -- ) " /rtc" mfg-test-dev ; +: display-item ( -- ) " /display" mfg-test-dev ; +: audio-item ( -- ) " /audio" mfg-test-dev ; +: camera-item ( -- ) " /camera" mfg-test-dev ; +: wlan-item ( -- ) " /wlan" mfg-test-dev ; +: timer-item ( -- ) " /timer" mfg-test-dev ; +: touchpad-item ( -- ) " /mouse" mfg-test-dev ; +: keyboard-item ( -- ) " /keyboard" mfg-test-dev ; + +: mfgtest-menu ( -- ) + clear-menu + + " Run all non-interactive tests. (Press a key between tests to stop.)" + ['] play-item play.icon 0 1 selected install-icon + + " Exit selftest mode." + ['] quit-item quit.icon 0 3 install-icon + + " CPU" + ['] cpu-item cpu.icon 1 0 install-icon + + " SPI Flash: Contains EC code, firmware, manufacturing data." + ['] flash-item spi.icon 1 1 install-icon + + " RAM chips" + ['] memory-item ram.icon 1 2 install-icon + + " SD card controllers - internal and external mass storage" + ['] sd-item sdcard.icon 1 3 install-icon + + " USB ports" + ['] usb-item usb.icon 1 4 install-icon + + " Battery" + ['] battery-item battery.icon 2 0 install-icon + + " Camera" + ['] camera-item camera.icon 2 1 install-icon + + " Wireless LAN" + ['] wlan-item wifi.icon 2 2 install-icon + + " Audio: Speaker and microphone" + ['] audio-item audio.icon 2 3 install-icon + + " Display" + ['] display-item display.icon 2 4 install-icon + + " RTC (Real-Time Clock)" + ['] rtc-item clock.icon 3 0 install-icon + + " ISA Timer" + ['] timer-item timer.icon 3 1 install-icon + + \ These are last because they require user participation. + \ The earlier tests are all included in automatic batch-mode. + + " Keyboard" + ['] keyboard-item keyboard.icon 3 2 install-icon + + " Touchpad" + ['] touchpad-item touchpad.icon 3 3 install-icon + +; + +' mfgtest-menu to root-menu +' noop to do-title + +\ LICENSE_BEGIN +\ Copyright (c) 2009 Luke Gorrie +\ +\ 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 Modified: cpu/x86/pc/olpc/via/olpc.bth =================================================================== --- cpu/x86/pc/olpc/via/olpc.bth 2009-08-24 23:02:25 UTC (rev 1324) +++ cpu/x86/pc/olpc/via/olpc.bth 2009-08-25 03:04:49 UTC (rev 1325) @@ -31,8 +31,8 @@ \ in: ${BP}/cpu/x86/pc/olpc/via/build/mcastnand.bin in: ${BP}/dev/hdaudio/build/hdaudio.fc in: sd8686.bin +in: testicons.bin - build-now fload ${BP}/cpu/x86/pc/olpc/via/versions.fth @@ -160,6 +160,24 @@ " ${BP}/cpu/x86/pc/olpc/via/build/dsdt.aml" " dsdt" $add-deflated-dropin \ " ${BP}/cpu/x86/pc/olpc/via/build/ssdt.aml" " ssdt" $add-deflated-dropin + \ icons for mfg test gui + " testicons/play.565" " play.565" $add-deflated-dropin + " testicons/quit.565" " quit.565" $add-deflated-dropin + " testicons/cpu.565" " cpu.565" $add-deflated-dropin + " testicons/spi.565" " spi.565" $add-deflated-dropin + " testicons/ram.565" " ram.565" $add-deflated-dropin + " testicons/sdcard.565" " sdcard.565" $add-deflated-dropin + " testicons/keyboard.565" " keyboard.565" $add-deflated-dropin + " testicons/display.565" " display.565" $add-deflated-dropin + " testicons/touchpad.565" " touchpad.565" $add-deflated-dropin + " testicons/audio.565" " audio.565" $add-deflated-dropin + " testicons/usb.565" " usb.565" $add-deflated-dropin + " testicons/battery.565" " battery.565" $add-deflated-dropin + " testicons/camera.565" " camera.565" $add-deflated-dropin + " testicons/wifi.565" " wifi.565" $add-deflated-dropin + " testicons/clock.565" " clock.565" $add-deflated-dropin + " testicons/timer.565" " timer.565" $add-deflated-dropin + [ifdef] Later " ${BP}/cpu/x86/pc/olpc/via/build/nandblaster_rx.bin" " nb_rx" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/via/build/nandblaster_tx.bin" " nb_tx" $add-deflated-dropin Added: cpu/x86/pc/olpc/via/testicons.bth =================================================================== --- cpu/x86/pc/olpc/via/testicons.bth (rev 0) +++ cpu/x86/pc/olpc/via/testicons.bth 2009-08-25 03:04:49 UTC (rev 1325) @@ -0,0 +1,11 @@ +purpose: Expand the test icons + +command: &builder &this +build-now + +" tar xfz ../testicons.tgz" expand$ $sh + +\ This forces the creation of a .log file, so we don't re-fetch +writing testicons.version +" 1" ofd @ fputs +ofd @ fclose Added: cpu/x86/pc/olpc/via/testicons.tgz =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/via/testicons.tgz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: dev/video/common/rectangle16.fth =================================================================== --- dev/video/common/rectangle16.fth 2009-08-24 23:02:25 UTC (rev 1324) +++ dev/video/common/rectangle16.fth 2009-08-25 03:04:49 UTC (rev 1325) @@ -59,6 +59,15 @@ ; : dimensions ( -- width height ) width height ; +: replace-color16 ( old new -- ) + frame-buffer-adr width height * 2* bounds do + over i w@ = if + dup i w! + then + 2 +loop + 2drop +; + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \ Modified: ofw/gui/bmp24rgb565.fth =================================================================== --- ofw/gui/bmp24rgb565.fth 2009-08-24 23:02:25 UTC (rev 1324) +++ ofw/gui/bmp24rgb565.fth 2009-08-25 03:04:49 UTC (rev 1325) @@ -1,6 +1,7 @@ \ See license at end of file purpose: Conversion from RGB888 BMP to RGB565 raw formats +0 value pixels-offset 0 value image-width 0 value image-height 0 value #planes @@ -22,7 +23,7 @@ : get-planes ( -- ) #planes 0 ?do image-height 0 do - image-height i 1+ - line-bytes * /bmp-hdr + ifd @ fseek + image-height i 1+ - line-bytes * pixels-offset + ifd @ fseek image-width copy-scan-line loop loop @@ -31,6 +32,7 @@ : putw ( w -- ) wbsplit swap ofd @ fputc ofd @ fputc ; : bmp>rects ( -- ) + bmp-hdr h# 0a + le-l@ to pixels-offset bmp-hdr h# 12 + le-l@ to image-width bmp-hdr h# 16 + le-l@ to image-height bmp-hdr h# 1a + le-w@ to #planes Modified: ofw/gui/graphics.fth =================================================================== --- ofw/gui/graphics.fth 2009-08-24 23:02:25 UTC (rev 1324) +++ ofw/gui/graphics.fth 2009-08-25 03:04:49 UTC (rev 1325) @@ -12,9 +12,10 @@ 7 constant gray h# f constant white -h# 13 constant background -gray constant selected-color -blue constant ready-color +h# ff h# ff h# ff rgb>565 value background +\ h# 0010 value selected-color + 0 0 h# 80 rgb>565 value selected-color +h# ff h# ff h# ff rgb>565 value ready-color \ \\\\\\\\\\\\\\\\ \ Device Support \ @@ -23,7 +24,7 @@ \needs screen-ih 0 value screen-ih 0 value mouse-ih -d# 640 d# 480 2value max-xy +d# 1200 d# 900 2value max-xy : max-x ( -- n ) max-xy drop ; : max-y ( -- n ) max-xy nip ; Modified: ofw/gui/iconmenu.fth =================================================================== --- ofw/gui/iconmenu.fth 2009-08-24 23:02:25 UTC (rev 1324) +++ ofw/gui/iconmenu.fth 2009-08-25 03:04:49 UTC (rev 1325) @@ -12,9 +12,9 @@ \ user can select an icon, and execute its function \ notes -\ screen is max-x >= 640 by max-y >= 480 (can assume 640x480 for now) +\ screen is max-x >= 1200 by max-y >= 900 (can assume 1200x900 for now) \ 0,0 is left,top; 12 boxes 128x128 begin at 48,48 -\ each may contain a 64x64 icon, centered, and a string below +\ each may contain a 128x128 icon, centered, and a string below \ mouse or keyboard can select, and run associated function \ moving mouse cursor into occupied square changes selection \ keyboard input removes mouse cursor and moves mouse to selected square @@ -25,7 +25,7 @@ \ have: \ fill-rectangle ( color x y w h - ) color is 0..255 -\ draw-rectangle ( address x y w h - ) address of 64x64 pixmap +\ draw-rectangle ( address x y w h - ) address of 128x128 pixmap \ read-rectangle ( address x y w h - ) \ move-mouse-cursor ( x y - ) \ remove-mouse-cursor ( - ) @@ -38,13 +38,14 @@ headers d# 32 value version-height -3 constant rows +4 constant rows 5 constant cols headerless rows cols * constant squares -d# 100 constant sq-size -d# 64 constant icon-size -d# 100 constant title-area +d# 180 value sq-size +d# 128 value image-size \ on file +d# 128 value icon-size \ on screen +d# 100 value title-area : sq-max-y ( -- pixels ) sq-size rows * ; @@ -88,16 +89,20 @@ struct /n field >icon + /n field >pixels /n field >function + /n field >border 2 /n * field >help \ Brief description \ 32 field >label \ later... dup constant /entry squares * buffer: squarebuf - +icon-size dup * 2 * constant /icon +image-size dup * 2 * 8 + constant /image + : sq ( sq - a ) sq? /entry * squarebuf + ; : set-sq ( help$ 'function 'icon sq - ) - sq tuck >icon ! tuck >function ! ( help$ 'entry ) + sq background over >border ! tuck >icon ! tuck >function ! ( help$ 'entry ) >r ?save-string r> >help 2! ; @@ -129,16 +134,18 @@ d# 10 constant thickness -: hilite ( color - ) - current-sq sq>xy ( color left top ) - sq-size icon-size - 2/ thickness - tuck + -rot + swap - icon-size thickness 2* + dup thickness box +: draw-border ( color sq - ) + sq>xy ( color left top ) + sq-size icon-size - thickness 3 * - 2/ tuck + -rot + swap + icon-size thickness 3 * + dup thickness 2/ box ; +: hilite ( color - ) current-sq draw-border ; + headers : emphasize ( - ) ready-color hilite ; : highlight ( - ) selected-color hilite ; -: lowlight ( - ) background hilite ; +: lowlight ( - ) current-sq sq >border @ hilite ; headerless : ?lowlight ( -- ) current-sq valid? if lowlight then ; @@ -147,14 +154,102 @@ : describe ( -- ) current-sq sq >help 2@ show-description ; -: draw-sq ( sq - ) + +code expand-rect ( src dst w h --- ) + dx pop \ Height of source image in pixels + 4 [sp] edi xchg + 8 [sp] esi xchg + begin + 0 [sp] cx mov \ Width of source image in pixels + begin + op: ax lods \ Get a pixel + op: ax d# 256 [edi] mov \ Write to next line + op: ax stos \ Write to this line + increment + op: ax d# 256 [edi] mov \ Write to next line + op: ax stos \ Write to this line + increment + loopa + d# 256 # edi add \ Skip the next output line - already written + edx dec + 0= until + eax pop \ Discard source width + edi pop \ Restore EDI + esi pop \ Restore ESI +c; + +: expand-icon ( adr - eadr ) + /icon alloc-mem tuck ( eadr adr eadr ) + dup /icon 0 fill \ temp - clear old data + icon-size 2/ icon-size 2/ expand-rect ( eadr ) +; + +alias /pix* /w* + +0 value src-w +0 value src-h + +: center-icon ( hdr-adr -- eadr ) + /icon alloc-mem >r ( hdr-adr r: eadr ) + r@ /icon 2 pick 8 + le-w@ wfill ( hdr-adr ) + dup 4 + le-w@ to src-w ( hdr-adr ) + dup 6 + le-w@ to src-h ( hdr-adr ) + 8 + ( src-adr ) + + \ Calculate offset in dest array for centering + icon-size src-h - 2/ icon-size * ( src-adr line-offset ) + icon-size src-w - 2/ + /pix* ( src-adr byte-offset ) + r@ + ( src-adr dst-adr ) + + \ Copy rectangle from source to destination + swap src-h src-w * /pix* bounds ?do ( dst-adr ) + i over src-w /pix* move ( dst-adr ) + icon-size /pix* + ( dst-adr' ) + src-w /pix* +loop ( dst-adr ) + drop ( ) + r> ( eadr ) +; + +: load-pixels ( device$ -- pix-adr ) + r/o open-file abort" error opening icon file" + >r ( r: fileid ) + r@ fsize dup alloc-mem swap ( adr len r: fileid ) + 2dup r@ fgets ( adr len actual r: fileid ) + over <> abort" error reading icon data" ( adr len ) + r> fclose ( adr len ) + + over 4 + le-l@ h# 0040.0040 = if ( hdr-adr len ) + over 8 + expand-icon ( hdr-adr len pix-adr ) + -rot free-mem ( pix-adr ) + else ( hdr-adr len ) + over 4 + le-l@ h# 0080.0080 = if ( hdr-adr len ) + drop 8 + ( pix-adr ) + else ( hdr-adr len ) + over center-icon ( hdr-adr len pix-adr ) + -rot free-mem ( pix-adr ) + then + then +; + +: load-icon ( sq -- ) + sq dup >pixels @ 0= if ( sq-adr ) + dup >icon @ count load-pixels ( sq-adr pix-adr ) + swap >pixels ! ( ) + else + drop ( ) + then +; + +: draw-sq ( sq -- ) dup -1 = if exit then background over sq>xy sq-size dup fill-rectangle - dup sq >icon @ dup if + dup sq >border @ over draw-border + dup sq >icon @ if + dup load-icon + dup sq >pixels @ swap sq>xy sq-size icon-size - 2/ tuck + -rot + swap icon-size dup draw-rectangle + lowlight \ draw border else - 2drop + drop then ; Modified: ofw/gui/menumisc.fth =================================================================== --- ofw/gui/menumisc.fth 2009-08-24 23:02:25 UTC (rev 1324) +++ ofw/gui/menumisc.fth 2009-08-25 03:04:49 UTC (rev 1325) @@ -51,8 +51,8 @@ ; \ Defining word for icon images -: icon: ( "name" "filename" -- ) ( child: -- adr ) - create parse-word $file, +: icon: ( "name" "devicename" -- ) ( child: -- adr ) + create parse-word ", ; icon: exit.icon ${BP}/ofw/gui/exeunt.icx Modified: ofw/gui/rgb565bmp24.fth =================================================================== --- ofw/gui/rgb565bmp24.fth 2009-08-24 23:02:25 UTC (rev 1324) +++ ofw/gui/rgb565bmp24.fth 2009-08-25 03:04:49 UTC (rev 1325) @@ -78,8 +78,8 @@ ; : raw565bmp24 ( -- ) reading writing - d# 640 to image-width - d# 480 to image-height + d# 1200 to image-width + d# 900 to image-height 565>rects ifd @ fclose ofd @ fclose

1 0

r1324 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 24 Aug '09

24 Aug '09

Author: wmb Date: 2009-08-25 01:02:25 +0200 (Tue, 25 Aug 2009) New Revision: 1324 Modified: cpu/x86/pc/olpc/via/fw.bth Log: Addition to last checkin. Modified: cpu/x86/pc/olpc/via/fw.bth =================================================================== --- cpu/x86/pc/olpc/via/fw.bth 2009-08-24 22:57:53 UTC (rev 1323) +++ cpu/x86/pc/olpc/via/fw.bth 2009-08-24 23:02:25 UTC (rev 1324) @@ -233,6 +233,7 @@ fload ${BP}/cpu/x86/pc/boot.fth fload ${BP}/cpu/x86/pc/linux.fth +0 value keyboard-ih 0 value screen-ih fload ${BP}/ofw/core/muxdev.fth \ I/O collection/distribution device @@ -306,6 +307,7 @@ fload ${BP}/ofw/gui/loadmenu.fth fload ${BP}/ofw/gui/insticon.fth +\ fload ${BP}/cpu/x86/pc/olpc/via/mfgtest.fth : screen-#lines ( -- n ) screen-ih 0= if default-#lines exit then @@ -375,8 +377,6 @@ fload ${BP}/cpu/x86/pc/olpc/life.fth [ifdef] wlan-wackup fload ${BP}/cpu/x86/pc/olpc/wlantest.fth - -' gx-power-off to power-off [then] fload ${BP}/cpu/x86/pc/olpc/rtcwake.fth @@ -548,8 +548,6 @@ warning on only forth also definitions - install-alarm - page-mode #line off @@ -640,6 +638,7 @@ probe-pci show-child + install-alarm sound ?games \ XXX we should put up the splash screen here

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware