openfirmware

openfirmware@openfirmware.info

3007 discussions

r1698 - ofw/fs/ext2fs
by svn＠openfirmware.info 25 Jan '10

25 Jan '10

Author: wmb Date: 2010-01-25 09:37:51 +0100 (Mon, 25 Jan 2010) New Revision: 1698 Modified: ofw/fs/ext2fs/dir.fth Log: OLPC trac 9998 - ext2 file system - Fixed problem with deleting the last file in a directory. Modified: ofw/fs/ext2fs/dir.fth =================================================================== --- ofw/fs/ext2fs/dir.fth 2010-01-25 08:36:22 UTC (rev 1697) +++ ofw/fs/ext2fs/dir.fth 2010-01-25 08:37:51 UTC (rev 1698) @@ -201,6 +201,7 @@ \ delete directory entry at diroff : dirent-unlink ( -- ) + inode# >r dirent-inode@ set-inode -1 +link-count \ Release the inode if it has no more links @@ -217,6 +218,7 @@ \ First dirent in block; zap its inode 0 dirent-inode! then + r> set-inode ; \ The argument inode# means the inode to which the new directory entry

1 0

r1697 - cpu/x86/pc/olpc/via dev/mmc/sdhci
by svn＠openfirmware.info 25 Jan '10

25 Jan '10

Author: wmb Date: 2010-01-25 09:36:22 +0100 (Mon, 25 Jan 2010) New Revision: 1697 Modified: cpu/x86/pc/olpc/via/fw.bth dev/mmc/sdhci/sdhci.fth dev/mmc/sdhci/sdmmc.fth Log: OLPC trac 9484 - NANDblaster is now working reasonably well in wired mode. Modified: cpu/x86/pc/olpc/via/fw.bth =================================================================== --- cpu/x86/pc/olpc/via/fw.bth 2010-01-25 08:34:05 UTC (rev 1696) +++ cpu/x86/pc/olpc/via/fw.bth 2010-01-25 08:36:22 UTC (rev 1697) @@ -500,6 +500,7 @@ fload ${BP}/cpu/x86/pc/olpc/nandcastui.fth fload ${BP}/cpu/x86/pc/olpc/wifichannel.fth +fload ${BP}/cpu/x86/pc/olpc/via/blockfifo.fth fload ${BP}/cpu/x86/pc/olpc/via/fsupdate.fth fload ${BP}/cpu/x86/pc/olpc/via/fsverify.fth devalias fsdisk int:0 Modified: dev/mmc/sdhci/sdhci.fth =================================================================== --- dev/mmc/sdhci/sdhci.fth 2010-01-25 08:34:05 UTC (rev 1696) +++ dev/mmc/sdhci/sdhci.fth 2010-01-25 08:36:22 UTC (rev 1697) @@ -323,6 +323,27 @@ ." Stopping" cr abort ; +: isr-event? ( mask -- happened? ) + h# 8000 or ( mask' ) + isr@ 2dup and if ( mask' isr ) + \ Only clear the bits we will handle this time. + \ If additional ISR bits are set, leave them set because + \ later code will be waiting for them. In practice, the + \ only such additional bit is the "data transfer complete" + \ bit - mask 2 - which "2 wait" will handle. + \ But we do go ahead and clear card removal/insertion + \ events, because we don't handle them elsewhere. + swap h# c0 or over and isr! ( isr ) + + dup h# 8000 and if .sderror else drop then ( ) + true + else ( mask' isr ) + \ DMA interrupt - the transfer crossed an address boundary + 8 and if 0 cl@ 0 cl! 8 isr! then ( mask ) + drop false ( false ) + then +; + : wait ( mask -- ) h# 8000 or ( mask' ) begin ( mask ) @@ -711,6 +732,28 @@ drop ; +: card-error? ( status -- error? ) + dup h# fdf9.8008 and if ( status ) + cr ." SD Error - status = " dup . cr + .card-error + true + else + drop + false + then +; + +: write-done? ( -- false | error? true ) + intstat-on + get-status dup 9 rshift h# f and 7 = if ( status ) + drop false ( false ) + else ( status ) + card-error? ( error? ) + true ( error? true ) + then ( false | error? true ) + intstat-off ( false | error? true ) +; + \ This is the correct way to wait for programming complete. : wait-write-done ( -- error? ) writing? 0= if false exit then ( limit ) @@ -724,15 +767,7 @@ then repeat ( limit status ) nip ( status ) - dup h# fdf9.8008 and if ( status ) - cr ." SD Error - status = " dup . cr - .card-error - true - else - drop - false - then - + card-error? ( error? ) false to writing? ; @@ -772,6 +807,18 @@ 0 instance value dma? +: dma-done? ( -- flag ) + dma? if + 2 isr-event? dup if ( flag ) + dma-release ( flag ) + intstat-off ( flag ) + false to dma? ( flag ) + then ( flag ) + else + true + then +; + : wait-dma-done ( -- ) dma? if 2 wait @@ -865,6 +912,17 @@ : detach-sdio-card ( -- ) ; +\ Asynchronous poll for completion +: r/w-blocks-end? ( in? -- false | error? true ) + drop + dma-done? if + write-done? + else + false + then +; + +\ Wait for completion : r/w-blocks-end ( in? -- error? ) drop wait-dma-done Modified: dev/mmc/sdhci/sdmmc.fth =================================================================== --- dev/mmc/sdhci/sdmmc.fth 2010-01-25 08:34:05 UTC (rev 1696) +++ dev/mmc/sdhci/sdmmc.fth 2010-01-25 08:36:22 UTC (rev 1697) @@ -40,6 +40,9 @@ : write-blocks-end ( -- error? ) false " r/w-blocks-end" $call-parent ; +: write-blocks-end? ( -- false | error? true ) + false " r/w-blocks-end?" $call-parent +; : dma-alloc ( size -- vadr ) " dma-alloc" $call-parent ; : dma-free ( vadr size -- ) " dma-free" $call-parent ;

1 0

r1696 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 25 Jan '10

25 Jan '10

Author: wmb Date: 2010-01-25 09:34:05 +0100 (Mon, 25 Jan 2010) New Revision: 1696 Added: cpu/x86/pc/olpc/via/crypto-version.fth cpu/x86/pc/olpc/via/ec-version.fth cpu/x86/pc/olpc/via/fw-version.fth cpu/x86/pc/olpc/via/mcnand-version.fth cpu/x86/pc/olpc/via/wlan-version.fth Modified: cpu/x86/pc/olpc/via/ec.bth cpu/x86/pc/olpc/via/mcastnand.bth cpu/x86/pc/olpc/via/olpc.bth cpu/x86/pc/olpc/via/sd8686.bth cpu/x86/pc/olpc/via/verify.bth cpu/x86/pc/olpc/via/versions.fth Log: XO-1.5 - Split the versions.fth file into separate files for each versioned component to eliminate unnecessary rebuilding. Added: cpu/x86/pc/olpc/via/crypto-version.fth =================================================================== --- cpu/x86/pc/olpc/via/crypto-version.fth (rev 0) +++ cpu/x86/pc/olpc/via/crypto-version.fth 2010-01-25 08:34:05 UTC (rev 1696) @@ -0,0 +1,6 @@ +\ The public keys +macro: KEYS mpkeys +\ macro: KEYS testkeys + +\ The bios_verify image +macro: CRYPTO_VERSION 0.5 Added: cpu/x86/pc/olpc/via/ec-version.fth =================================================================== --- cpu/x86/pc/olpc/via/ec-version.fth (rev 0) +++ cpu/x86/pc/olpc/via/ec-version.fth 2010-01-25 08:34:05 UTC (rev 1696) @@ -0,0 +1,7 @@ +\ The EC microcode +macro: EC_VERSION 1_9_21 + +\ Alternate command for getting EC microcode, for testing new versions. +\ Temporarily uncomment the line and modify the path as necessary +\ macro: GET_EC cp ~rsmith/olpc/ec/ec-code15/image/ecimage.bin ec.img +\ macro: GET_EC wget -q http://dev.laptop.org/pub/ec/ec_test.img -O ec.img Modified: cpu/x86/pc/olpc/via/ec.bth =================================================================== --- cpu/x86/pc/olpc/via/ec.bth 2010-01-24 22:52:12 UTC (rev 1695) +++ cpu/x86/pc/olpc/via/ec.bth 2010-01-25 08:34:05 UTC (rev 1696) @@ -3,7 +3,7 @@ command: &builder &this build-now -fload ${BP}/cpu/x86/pc/olpc/via/versions.fth +fload ${BP}/cpu/x86/pc/olpc/via/ec-version.fth \ If there is a GET_EC macro, use it instead of fetching the released version. " ${GET_EC}" expand$ nip [if] Added: cpu/x86/pc/olpc/via/fw-version.fth =================================================================== --- cpu/x86/pc/olpc/via/fw-version.fth (rev 0) +++ cpu/x86/pc/olpc/via/fw-version.fth 2010-01-25 08:34:05 UTC (rev 1696) @@ -0,0 +1,3 @@ +\ The overall firmware revision +macro: FW_MAJOR A +macro: FW_MINOR 29c Modified: cpu/x86/pc/olpc/via/mcastnand.bth =================================================================== --- cpu/x86/pc/olpc/via/mcastnand.bth 2010-01-24 22:52:12 UTC (rev 1695) +++ cpu/x86/pc/olpc/via/mcastnand.bth 2010-01-25 08:34:05 UTC (rev 1696) @@ -3,7 +3,7 @@ command: &builder &this build-now -fload ${BP}/cpu/x86/pc/olpc/via/versions.fth +fload ${BP}/cpu/x86/pc/olpc/via/mcnand-version.fth 1 [if] " ${MCNAND_VERSION}" expand$ " test" $= [if] Added: cpu/x86/pc/olpc/via/mcnand-version.fth =================================================================== --- cpu/x86/pc/olpc/via/mcnand-version.fth (rev 0) +++ cpu/x86/pc/olpc/via/mcnand-version.fth 2010-01-25 08:34:05 UTC (rev 1696) @@ -0,0 +1,8 @@ +\ The multicast NAND updater code version +\ Use a specific git commit ID for a formal release or "test" for development. +\ With a specific ID, mcastnand.bth will download a tarball without .git stuff. +\ With "test", mcastnand.bth will clone the git head if build/multicast-nand/ +\ is not already present, then you can modify the git subtree as needed. +macro: MCNAND_VERSION 4ead46ac3b8b2a52e20661c27f7c72a77b38a16b +\ macro: MCNAND_VERSION test +\ macro: MCNAND_VERSION HEAD Modified: cpu/x86/pc/olpc/via/olpc.bth =================================================================== --- cpu/x86/pc/olpc/via/olpc.bth 2010-01-24 22:52:12 UTC (rev 1695) +++ cpu/x86/pc/olpc/via/olpc.bth 2010-01-25 08:34:05 UTC (rev 1696) @@ -39,7 +39,7 @@ build-now -fload ${BP}/cpu/x86/pc/olpc/via/versions.fth +fload ${BP}/cpu/x86/pc/olpc/via/fw-version.fth " macro: FW_VERSION Q3${FW_MAJOR}${FW_MINOR}" expand$ eval Modified: cpu/x86/pc/olpc/via/sd8686.bth =================================================================== --- cpu/x86/pc/olpc/via/sd8686.bth 2010-01-24 22:52:12 UTC (rev 1695) +++ cpu/x86/pc/olpc/via/sd8686.bth 2010-01-25 08:34:05 UTC (rev 1696) @@ -3,7 +3,7 @@ command: &builder &this build-now -fload ${BP}/cpu/x86/pc/olpc/via/versions.fth +fload ${BP}/cpu/x86/pc/olpc/via/wlan-version.fth " ${GET_WLAN}" expand$ nip [if] " ${GET_WLAN}" expand$ $sh Modified: cpu/x86/pc/olpc/via/verify.bth =================================================================== --- cpu/x86/pc/olpc/via/verify.bth 2010-01-24 22:52:12 UTC (rev 1695) +++ cpu/x86/pc/olpc/via/verify.bth 2010-01-25 08:34:05 UTC (rev 1696) @@ -3,7 +3,7 @@ command: &builder &this build-now -fload ${BP}/cpu/x86/pc/olpc/via/versions.fth +fload ${BP}/cpu/x86/pc/olpc/via/crypto-version.fth " wget -q http://dev.laptop.org/pub/firmware/crypto/${KEYS}/os.public -O os.public" expand$ $sh " wget -q http://dev.laptop.org/pub/firmware/crypto/${KEYS}/fw.public -O fw.public" expand$ $sh Modified: cpu/x86/pc/olpc/via/versions.fth =================================================================== --- cpu/x86/pc/olpc/via/versions.fth 2010-01-24 22:52:12 UTC (rev 1695) +++ cpu/x86/pc/olpc/via/versions.fth 2010-01-25 08:34:05 UTC (rev 1696) @@ -1,35 +1,7 @@ \ Version numbers of items included in the OLPC firmware image -\ The overall firmware revision -macro: FW_MAJOR A -macro: FW_MINOR 29 - -\ The EC microcode -macro: EC_VERSION 1_9_21 - -\ Alternate command for getting EC microcode, for testing new versions. -\ Temporarily uncomment the line and modify the path as necessary -\ macro: GET_EC cp ~rsmith/olpc/ec/ec-code15/image/ecimage.bin ec.img -\ macro: GET_EC wget -q http://dev.laptop.org/pub/ec/ec_test.img -O ec.img - -macro: KEYS mpkeys -\ macro: KEYS testkeys - -\ The wireless LAN module firmware -macro: WLAN_VERSION 9.70.7.p0 - -\ Alternate command for getting WLAN firmware, for testing new versions. -\ Temporarily uncomment the line and modify the path as necessary -\ macro: GET_WLAN cp "/c/Documents and Settings/Mitch Bradley/My Documents/OLPC/DiskImages/sd8686-9.70.7.p0.bin" sd8686.bin; cp "/c/Documents and Settings/Mitch Bradley/My Documents/OLPC/DiskImages/sd8686_helper.bin" sd8686_helper.bin - -\ The bios_verify image -macro: CRYPTO_VERSION 0.5 - -\ The multicast NAND updater code version -\ Use a specific git commit ID for a formal release or "test" for development. -\ With a specific ID, mcastnand.bth will download a tarball without .git stuff. -\ With "test", mcastnand.bth will clone the git head if build/multicast-nand/ -\ is not already present, then you can modify the git subtree as needed. -macro: MCNAND_VERSION 0fcff94005b9570e4b7f1406f2f9e155f828b6d2 -\ macro: MCNAND_VERSION test -\ macro: MCNAND_VERSION HEAD +fload ${BP}/cpu/x86/pc/olpc/via/fw-version.fth +fload ${BP}/cpu/x86/pc/olpc/via/ec-version.fth +fload ${BP}/cpu/x86/pc/olpc/via/wlan-version.fth +fload ${BP}/cpu/x86/pc/olpc/via/crypto-version.fth +fload ${BP}/cpu/x86/pc/olpc/via/mcnand-version.fth Added: cpu/x86/pc/olpc/via/wlan-version.fth =================================================================== --- cpu/x86/pc/olpc/via/wlan-version.fth (rev 0) +++ cpu/x86/pc/olpc/via/wlan-version.fth 2010-01-25 08:34:05 UTC (rev 1696) @@ -0,0 +1,6 @@ +\ The wireless LAN module firmware +macro: WLAN_VERSION 9.70.7.p0 + +\ Alternate command for getting WLAN firmware, for testing new versions. +\ Temporarily uncomment the line and modify the path as necessary +\ macro: GET_WLAN cp "/c/Documents and Settings/Mitch Bradley/My Documents/OLPC/DiskImages/sd8686-9.70.7.p0.bin" sd8686.bin; cp "/c/Documents and Settings/Mitch Bradley/My Documents/OLPC/DiskImages/sd8686_helper.bin" sd8686_helper.bin

1 0

r1695 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 24 Jan '10

24 Jan '10

Author: wmb Date: 2010-01-24 23:52:12 +0100 (Sun, 24 Jan 2010) New Revision: 1695 Modified: cpu/x86/pc/olpc/via/devices.fth Log: OLPC trac 9496 - wrong CPU frequency reported in device tree. Modified: cpu/x86/pc/olpc/via/devices.fth =================================================================== --- cpu/x86/pc/olpc/via/devices.fth 2010-01-24 22:46:17 UTC (rev 1694) +++ cpu/x86/pc/olpc/via/devices.fth 2010-01-24 22:52:12 UTC (rev 1695) @@ -32,7 +32,7 @@ fload ${BP}/cpu/x86/pc/olpc/via/dumpvia.fth \ Dump a bunch of registers stand-init: CPU node - d# 1,500,000,000 " VIA,C7" + d# 1,000,000,000 " VIA,C7" " /cpu" find-device ( cpu-clock-hz model$ ) " model" string-property ( cpu-clock-hz )

1 0

r1694 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 24 Jan '10

24 Jan '10

Author: wmb Date: 2010-01-24 23:46:17 +0100 (Sun, 24 Jan 2010) New Revision: 1694 Modified: cpu/x86/pc/olpc/via/copynand.fth Log: XO-1.5 copynand - deleted more dead code. Modified: cpu/x86/pc/olpc/via/copynand.fth =================================================================== --- cpu/x86/pc/olpc/via/copynand.fth 2010-01-23 09:31:44 UTC (rev 1693) +++ cpu/x86/pc/olpc/via/copynand.fth 2010-01-24 22:46:17 UTC (rev 1694) @@ -47,27 +47,6 @@ defer show-init ( #eblocks -- ) ' drop to show-init -defer show-erasing ( #blocks -- ) -: (show-erasing) ( #blocks -- ) ." Erasing " . ." blocks" cr ; -' (show-erasing) to show-erasing - -defer show-erased ( block# -- ) -: (show-erased) ( block# -- ) (cr . ; -' (show-erased) to show-erased - -defer show-bad ( block# -- ) -' drop to show-bad - -defer show-bbt-block ( block# -- ) -' drop to show-bbt-block - -defer show-clean ( block# -- ) -' drop to show-clean - -defer show-cleaning ( -- ) -: (show-cleaning) ( -- ) cr ." Cleanmarkers" ; -' (show-cleaning) to show-cleaning - defer show-writing ( #blocks -- ) : (show-writing) ." Writing " . ." blocks" cr ; ' (show-writing) to show-writing @@ -87,10 +66,6 @@ : written? ( adr len -- flag ) h# ffffffff lskip 0<> ; -h# 80 h# 80 h# 80 rgb>565 constant bbt-color \ gray - 0 0 0 rgb>565 constant erased-color \ black -h# ff 0 0 rgb>565 constant bad-color \ red - 0 0 h# ff rgb>565 constant clean-color \ blue h# ff 0 h# ff rgb>565 constant partial-color \ magenta h# ff h# ff 0 rgb>565 constant pending-color \ yellow 0 h# ff 0 rgb>565 constant written-color \ green @@ -110,15 +85,8 @@ ." Blocks/square: " scale-factor .d ." Total blocks: " .d ; -: gshow-erasing ( #eblocks -- ) drop ." Erasing " ; - -: gshow-erased ( eblock# -- ) erased-color show-state ; -: gshow-bad ( eblock# -- ) bad-color show-state ; -: gshow-bbt-block ( eblock# -- ) bbt-color show-state ; -: gshow-clean ( eblock# -- ) clean-color show-state ; : gshow-strange ( eblock# -- ) strange-color show-state ; -: gshow-cleaning ( -- ) 7 status-line at-xy ." Cleanmarkers" cr ; : gshow-done ( -- ) cursor-on ; : gshow-pending ( eblock# -- ) pending-color show-state ; @@ -141,12 +109,6 @@ : gshow ['] gshow-init to show-init - ['] gshow-erasing to show-erasing - ['] gshow-erased to show-erased - ['] gshow-bad to show-bad - ['] gshow-bbt-block to show-bbt-block - ['] gshow-clean to show-clean - ['] gshow-cleaning to show-cleaning ['] gshow-pending to show-pending ['] gshow-writing to show-writing ['] gshow-written to show-written @@ -156,52 +118,6 @@ gshow -\ 0 - marked bad block : show-bad -\ 1 - unreadable block : show-bad -\ 2 - jffs2 w/ summary: show-written -\ 3 - jffs2 w/o summary: show-pending -\ 4 - clean : show-clean -\ 5 - non-jffs2 data : show-strange -\ 6 - erased : show-erased -\ 7 - primary bad-block-table : show-bbt-block -\ 8 - secondary bad-block-table : show-bbt-block -: show-block-type ( status eblock# -- ) - swap case - 0 of show-bad endof - 1 of show-bad endof - 2 of show-written endof - 3 of show-pending endof - 4 of show-clean endof - 5 of show-strange endof - 6 of show-erased endof - 7 of show-bbt-block endof - 8 of show-bbt-block endof - endcase -; - -0 value nand-map -0 value working-page -: classify-block ( page# -- status ) - to working-page - - working-page /nand-page um* " seek" $call-nand drop - - \ Try to read the first few bytes - load-base /l " read" $call-nand - - \ Check for non-erased, non-JFFS2 data - load-base l@ h# ffff.ffff <> if 5 exit then - - \ See if the whole thing is really completely erased - load-base /l + /nand-block /l - " read" $call-nand /nand-block /l - <> if 1 exit then - - \ Not completely erased - load-base /nand-block written? if 5 exit then - - \ Erased - 6 -; - 0 value current-block : cell-border ( block# color -- )

1 0

r1693 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 23 Jan '10

23 Jan '10

Author: wmb Date: 2010-01-23 10:31:44 +0100 (Sat, 23 Jan 2010) New Revision: 1693 Modified: cpu/x86/pc/olpc/via/smt.fth Log: Oops on last checkin - XO-1.5 smt.fth wanted-fw should have been q3a29 Modified: cpu/x86/pc/olpc/via/smt.fth =================================================================== --- cpu/x86/pc/olpc/via/smt.fth 2010-01-23 08:57:20 UTC (rev 1692) +++ cpu/x86/pc/olpc/via/smt.fth 2010-01-23 09:31:44 UTC (rev 1693) @@ -12,7 +12,7 @@ ; -: wanted-fw$ ( -- $ ) " q3a30" ; +: wanted-fw$ ( -- $ ) " q3a29" ; : find-firmware-file ( -- name$ )

1 0

r1692 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 23 Jan '10

23 Jan '10

Author: wmb Date: 2010-01-23 09:57:20 +0100 (Sat, 23 Jan 2010) New Revision: 1692 Modified: cpu/x86/pc/olpc/via/smt.fth Log: XO-1.5 smt.fth - wanted-fw set to q3a30 Modified: cpu/x86/pc/olpc/via/smt.fth =================================================================== --- cpu/x86/pc/olpc/via/smt.fth 2010-01-23 08:26:01 UTC (rev 1691) +++ cpu/x86/pc/olpc/via/smt.fth 2010-01-23 08:57:20 UTC (rev 1692) @@ -12,7 +12,7 @@ ; -: wanted-fw$ ( -- $ ) " q3a23" ; +: wanted-fw$ ( -- $ ) " q3a30" ; : find-firmware-file ( -- name$ )

1 0

r1691 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 23 Jan '10

23 Jan '10

Author: wmb Date: 2010-01-23 09:26:01 +0100 (Sat, 23 Jan 2010) New Revision: 1691 Modified: cpu/x86/pc/olpc/via/versions.fth Log: Q3A29 Modified: cpu/x86/pc/olpc/via/versions.fth =================================================================== --- cpu/x86/pc/olpc/via/versions.fth 2010-01-23 08:23:27 UTC (rev 1690) +++ cpu/x86/pc/olpc/via/versions.fth 2010-01-23 08:26:01 UTC (rev 1691) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 28 +macro: FW_MINOR 29 \ The EC microcode macro: EC_VERSION 1_9_21

1 0

r1690 - dev/usb2/hcd
by svn＠openfirmware.info 23 Jan '10

23 Jan '10

Author: wmb Date: 2010-01-23 09:23:27 +0100 (Sat, 23 Jan 2010) New Revision: 1690 Modified: dev/usb2/hcd/device.fth Log: USB - in the reuse-existing-driver test, added a check that the vendor-id, device-id, and revision match. Modified: dev/usb2/hcd/device.fth =================================================================== --- dev/usb2/hcd/device.fth 2010-01-23 08:21:50 UTC (rev 1689) +++ dev/usb2/hcd/device.fth 2010-01-23 08:23:27 UTC (rev 1690) @@ -281,6 +281,17 @@ r> drop ; +: id-match? ( dev intf port phandle -- dev intf port phandle flag? ) + " vendor-id" 2 pick get-package-property if false exit then + decode-int nip nip >r ( dev intf port phandle r: vid ) + " device-id" 2 pick get-package-property if r> drop false exit then + decode-int nip nip >r ( dev intf port phandle r: vid did ) + " release" 2 pick get-package-property if r> r> 2drop false exit then + decode-int nip nip >r ( dev intf port phandle r: vid did rev ) + dev-desc-buf get-vid ( dev intf port phandle vid1 did1 rev1 r: vid did rev ) + r> = -rot r> = -rot r> = and and +; + : reuse-old-node? ( dev intf port -- reused? ) my-self ihandle>phandle child ( dev intf port phandle ) begin ?dup while ( dev intf port phandle ) @@ -289,8 +300,10 @@ 4 pick = if ( dev intf port phandle adr len ) decode-int nip nip ( dev intf port phandle intf1 ) 3 pick = if ( dev intf port phandle ) - reuse-node ( ) - true exit ( -- true ) + id-match? if ( dev intf port phandle ) + reuse-node ( ) + true exit ( -- true ) + then ( dev intf port phandle ) then ( dev intf port phandle ) else ( dev intf port phandle adr len ) 2drop ( dev intf port phandle )

1 0

r1689 - dev/hdaudio
by svn＠openfirmware.info 23 Jan '10

23 Jan '10

Author: wmb Date: 2010-01-23 09:21:50 +0100 (Sat, 23 Jan 2010) New Revision: 1689 Modified: dev/hdaudio/test.fth Log: HDAudio selftest - Added a delay after connect-loopback to give time for complete insertion. Modified: dev/hdaudio/test.fth =================================================================== --- dev/hdaudio/test.fth 2010-01-23 05:26:28 UTC (rev 1688) +++ dev/hdaudio/test.fth 2010-01-23 08:21:50 UTC (rev 1689) @@ -151,6 +151,7 @@ ." Connect loopback cable to continue.. " begin ?key-abort loopback-connected? until cr then + d# 500 ms \ Time to make sure the plug is all the way in ; : disconnect-loopback ( -- ) loopback-disconnected? 0= if

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware