September 2012 - openfirmware - mail.coreboot.org

[commit] r3305 - cpu/arm/olpc
by repository service Sept. 13, 2012

Sept. 13, 2012

Author: wmb Date: Fri Sep 14 08:20:45 2012 New Revision: 3305 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3305 Log: OLPC ARM audio driver - missed a couple of mute bits for OUTMUX. Modified: cpu/arm/olpc/alc5631.fth Modified: cpu/arm/olpc/alc5631.fth ============================================================================== --- cpu/arm/olpc/alc5631.fth Fri Sep 14 08:19:54 2012 (r3304) +++ cpu/arm/olpc/alc5631.fth Fri Sep 14 08:20:45 2012 (r3305) @@ -268,7 +268,7 @@ \ : adc-unmute-outmix ( -- ) h# 8080 h# 14 codec-clr ; \ The useful one is outmix-unmute-dac -: outmix-mute-all ( -- ) h# ff00 dup h# 1a codec! h# 1c codec! ; +: outmix-mute-all ( -- ) h# ffc0 dup h# 1a codec! h# 1c codec! ; : outmix-mute-mic ( -- ) h# 1000 dup h# 1a codec-set h# 1c codec-set ; : outmix-unmute-mic ( -- ) h# 1000 dup h# 1a codec-clr h# 1c codec-clr ; : outmix-mute-dac ( -- ) h# 2000 dup h# 1a codec-set h# 1c codec-set ;

1 0

[commit] r3304 - cpu/arm/olpc/cl4 dev/olpc/spiflash
by repository service Sept. 13, 2012

Sept. 13, 2012

Author: wmb Date: Fri Sep 14 08:19:54 2012 New Revision: 3304 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3304 Log: OLPC XO-4 - better support for different SPI FLASH sizes. Modified: cpu/arm/olpc/cl4/config.fth dev/olpc/spiflash/spiflash.fth dev/olpc/spiflash/spiui.fth Modified: cpu/arm/olpc/cl4/config.fth ============================================================================== --- cpu/arm/olpc/cl4/config.fth Fri Sep 14 08:18:41 2012 (r3303) +++ cpu/arm/olpc/cl4/config.fth Fri Sep 14 08:19:54 2012 (r3304) @@ -13,10 +13,10 @@ h# 10.0000 constant /rom \ Total size of SPI FLASH -/rom h# 1.0000 - constant mfg-data-offset \ Offset to manufacturing data area in SPI FLASH -/rom constant mfg-data-end-offset \ Offset to end of manufacturing data area in SPI FLASH -mfg-data-offset h# 30 - constant crc-offset \ e.g. 1e.ffd0 -crc-offset h# 10 - constant signature-offset \ e.g. 1e.ffc0 +: mfg-data-offset /rom h# 1.0000 - ; \ Offset to start of manufacturing data area in SPI FLASH +: mfg-data-end-offset /rom ; \ Offset to end of manufacturing data area in SPI FLASH +: crc-offset mfg-data-offset h# 30 - ; \ e.g. 1e.ffd0 +: signature-offset crc-offset h# 10 - ; \ e.g. 1e.ffc0 : signature$ " CL4" ; : model$ " olpc,XO-CL4" ; Modified: dev/olpc/spiflash/spiflash.fth ============================================================================== --- dev/olpc/spiflash/spiflash.fth Fri Sep 14 08:18:41 2012 (r3303) +++ dev/olpc/spiflash/spiflash.fth Fri Sep 14 08:19:54 2012 (r3304) @@ -297,6 +297,9 @@ \ those commands. The AB command seems to be supported by all \ of them, so it's a good starting point. +: 2mb-flash ( -- ) h# 20.0000 to /flash ; +: 1mb-flash ( -- ) h# 10.0000 to /flash ; + 0 value spi-id# : spi-identify ( -- ) ab-id to spi-id# @@ -305,11 +308,11 @@ \ a common page-write part or the SST part with its \ unique auto-increment address writing scheme. spi-id# case - h# 13 of ['] common-write endof - h# 34 of ['] common-write endof - h# bf of ['] sst-write endof - h# 14 of ['] common-write endof - h# 35 of ['] common-write endof + h# 13 of ['] common-write 1mb-flash endof + h# 34 of ['] common-write 1mb-flash endof + h# bf of ['] sst-write 1mb-flash endof + h# 14 of ['] common-write 1mb-flash endof + h# 35 of ['] common-write 2mb-flash endof \ On some old board the ID would read as 14 when it should have been something else. \ On CL4, 14 is the expected ID. \ ." The SPI FLASH ID reads as 14. This is due to an infrequent hardware problem." cr @@ -335,6 +338,7 @@ h# 13 of ." type 13 - Spansion, Winbond, or ST" endof h# 14 of ." type 14 - 2 MB" endof h# 34 of ." type 34 - Macronyx" endof + h# 35 of ." type 35 - 2 MB" endof endcase then ; @@ -364,7 +368,7 @@ ['] erase-spi-block to flash-erase-block ['] spi-protect to flash-protect use-spi-flash-read \ Might be overridden - h# 10.0000 to /flash + [ifdef] /rom /rom [else] h# 10.0000 [then] to /flash /spi-eblock to /flash-block ; use-spi-flash Modified: dev/olpc/spiflash/spiui.fth ============================================================================== --- dev/olpc/spiflash/spiui.fth Fri Sep 14 08:18:41 2012 (r3303) +++ dev/olpc/spiflash/spiui.fth Fri Sep 14 08:19:54 2012 (r3304) @@ -69,7 +69,25 @@ r> <> abort" Firmware image has bad internal CRC" ; +[ifndef] 2meg h# 20.0000 constant 2meg [then] +: +1m ( offset -- offset' ) 1meg + ; + +\ This is for upgrading an XO-4 with a 2 MiB FLASH part from +\ a 1 MiB installed OFW image to a 2 MiB OFW image. +\ After flash-open, /flash is the size of the physical SPI FLASH device. +\ On exit, /flash is the size of the image, i.e. the amount to program. +\ /rom is the size of the image that is currently running. +: ?upgrade-to-2mb ( len -- len ) + flash-open \ Sets /flash according to the device installed + dup 2meg = /rom 1meg = and /flash 2meg = and if + signature-offset +1m to signature-offset + mfg-data-offset +1m to mfg-data-offset + crc-offset +1m to crc-offset + then +; + : ?image-valid ( len -- ) + flash-open \ Sets /flash according to the device installed /flash <> abort" Image file is the wrong length" ." Got firmware version: " @@ -88,7 +106,7 @@ : $get-file ( "filename" -- ) $read-open - flash-buf /flash ifd @ fgets ( len ) + flash-buf 2meg ifd @ fgets ( len ) ifd @ fclose ?image-valid

1 0

[commit] r3303 - cpu/arm/olpc
by repository service Sept. 13, 2012

Sept. 13, 2012

Author: wmb Date: Fri Sep 14 08:18:41 2012 New Revision: 3303 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3303 Log: OLPC ARM audio driver - device tree tweaks for instantiating the Linux audio driver from the device tree. Modified: cpu/arm/olpc/sound.fth Modified: cpu/arm/olpc/sound.fth ============================================================================== --- cpu/arm/olpc/sound.fth Wed Sep 12 08:06:31 2012 (r3302) +++ cpu/arm/olpc/sound.fth Fri Sep 14 08:18:41 2012 (r3303) @@ -33,32 +33,53 @@ \ DMA IRQ status and mask registers, e.g. ICU_DMA_IRQ1_STATUS dev / +1 [if] new-device " adma" device-name - h# 800 +audio h# 100 reg - 3 encode-int 2 encode-int encode+ " mmp-mav-dma-channels" property + h# 900 +audio h# 100 reg + 5 encode-int 4 encode-int encode+ " mmp-mav-dma-channels" property " marvell,mmp-audio-dma" +compatible - current-device ( adma0-ph ) + " disabled" " status" string-property + current-device ( adma1-ph ) +finish-device + +new-device + ( adma1-ph ) encode-int " adma-node" property + " pcm" device-name + 1 0 reg + + \ This binds to the platform driver, a single point that collects + \ the Audio DMA resources + " marvell,mmp-pcm-audio" +compatible \ snd_soc_dai_link.cpu_dai_of_node + " disabled" " status" string-property + finish-device +[then] new-device " adma" device-name - h# 900 +audio h# 100 reg - 5 encode-int 4 encode-int encode+ " mmp-mav-dma-channels" property + h# 800 +audio h# 100 reg + 3 encode-int 2 encode-int encode+ " mmp-mav-dma-channels" property " marvell,mmp-audio-dma" +compatible - current-device ( adma0-ph adma1-ph ) + current-device ( adma0-ph ) finish-device new-device - " asram" device-name - audio-sram-pa /audio-sram reg + ( adma0-ph ) encode-int " adma-node" property + " pcm" device-name + 0 0 reg - \ We call this the platform driver, a single point that collects + \ This binds to the platform driver, a single point that collects \ the Audio DMA resources " marvell,mmp-pcm-audio" +compatible \ snd_soc_dai_link.cpu_dai_of_node - ( adma0-ph adma1-ph ) - encode-int rot encode-int encode+ " adma-nodes" property +finish-device + +new-device + " asram" device-name + audio-sram-pa /audio-sram reg + + " marvell,mmp-asram" +compatible finish-device new-device @@ -66,6 +87,10 @@ h# d00 +audio h# 100 reg " marvell,mmp-sspa-dai" +compatible +[ifdef] mmp2 " marvell,mmp3-sspa-dai" +compatible [then] +[ifdef] mmp3 " marvell,mmp3-sspa-dai" +compatible [then] + + " unused" " status" string-property " /pmua" encode-phandle d# 20 encode-int encode+ " clocks" property d# 3 " interrupts" integer-property @@ -77,6 +102,8 @@ h# c00 +audio h# 100 reg " marvell,mmp-sspa-dai" +compatible +[ifdef] mmp2 " marvell,mmp3-sspa-dai" +compatible [then] +[ifdef] mmp3 " marvell,mmp3-sspa-dai" +compatible [then] " /pmua" encode-phandle d# 20 encode-int encode+ " clocks" property d# 2 " interrupts" integer-property @@ -94,7 +121,9 @@ ; : start-audio-pll ( -- error? ) \ For VCXO=26 MHz, OCLK=12.2880 MHz - h# 200d.a189 h# 38 sspa! \ DIV_OCLK_MODULO=010 FRACT=00da1 ENA_DITHER=1 ICP=0 DIV_FBCCLK=01 DIV_MCLK=0 PU=1 + \ MMP2: DIV_OCLK_MODULO=010 FRACT=00da1 ENA_DITHER=1 ICP=0 DIV_FBCCLK=01 DIV_MCLK=0 PU=1 + \ MMP2: DIV_OCLK_MODULO=010 FRACT=00da1 ENA_DITHER=1 ICP=0 DIV_FBCCLK=01 DIV_MCLK=011 PU=1 + [ifdef] mmp3 h# a00d.a18d [else] h# 200d.a189 [then] h# 38 sspa! h# 0000.0801 h# 3c sspa! \ CLK_SEL=1 (AudioPLL) DIV_OCLK_PATTERN=01 d# 50 0 do h# 3c sspa@ h# 10000 and if @@ -108,7 +137,7 @@ : dly d# 10 us ; -false value use-audio-pll? +true value use-audio-pll? : audio-clock-on ( -- error? ) my-clock-on @@ -135,7 +164,7 @@ \ That is true on both MMP2 and MMP3 h# 20.0000 h# 1024 +mpmu io-set \ Enable 12S clock out to SSPA1 - h# 10800 h# 38 sspa! + \ h# 10800 h# 38 sspa! \ Appears unnecessary; not sure what it does \ Bits 14:9 set the divisor from SYSCLK to BITCLK. The setting below \ is d# 8, which gives BITCLK = 1.536 MHz. That's 32x 48000, just enough @@ -709,7 +738,15 @@ 0 0 " " " /" begin-package " audio-complex" device-name - " olpc,mmp-audio" +compatible +[ifdef] olpc-cl4 + " olpc,xo4-audio" +compatible +[then] +[ifdef] olpc-cl3 + " olpc,xo3-audio" +compatible +[then] +[ifdef] olpc-cl2 + " olpc,xo1.75-audio" +compatible +[then] \ The name that was hardcoded in the Linux driver was OLPC XO-1.75 " OLPC XO" " model" string-property @@ -722,9 +759,13 @@ " MIC2" +string " Mic Jack" +string " audio-routing" property + " rt5631" " dai-link-name" string-property + " rt5631" " stream-name" string-property + " rt5631-hifi" " codec-dai-name" string-property + " /audio-codec" encode-phandle " codec-node" property " /audio" encode-phandle " cpu-dai-node" property - " /asram" encode-phandle " platform-node" property + " /pcm" encode-phandle " platform-node" property \ SND_SOC_DAIFTM_xxx: \ 4000 is ..CBS_CFS - the codec is the slave for clk and FRM

1 0

[commit] r3302 - cpu/arm/olpc
by repository service Sept. 11, 2012

Sept. 11, 2012

Author: quozl Date: Wed Sep 12 08:06:31 2012 New Revision: 3302 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3302 Log: OLPC XO-4 - Neonode, use a red-yellow-green pseudocolour map for watch-fss and watch-fll, leave the greyscale mode available for visually challenged Modified: cpu/arm/olpc/nn-touchscreen.fth Modified: cpu/arm/olpc/nn-touchscreen.fth ============================================================================== --- cpu/arm/olpc/nn-touchscreen.fth Mon Sep 10 13:33:13 2012 (r3301) +++ cpu/arm/olpc/nn-touchscreen.fth Wed Sep 12 08:06:31 2012 (r3302) @@ -544,10 +544,15 @@ fill-rectangle-noff ( ) ; -: level>colour ( signal-value -- colour ) - d# 3 rshift dup d# 5 lshift over d# 11 lshift or or +: >grey ( level -- colour ) dup dup rgb>565 ; + +: >pseudo ( level -- colour ) \ a red-yellow-green pseudocolour bar + d# 256 over - 2* d# 255 min swap 2* d# 255 min 0 rgb>565 ; +defer level>rgb +' >pseudo is level>rgb + : ys>xy ( signal# -- x y ) yx swap ( x signal# ) screen-h yleds 2* / * ( x y ) @@ -569,7 +574,7 @@ 0 value axis# : draw-signal ( signal# level -- x y ) - level>colour pixcolor ! ( signal# ) + level>rgb pixcolor ! ( signal# ) axis# if ( signal# ) \ y ys>xy else ( signal# ) \ x

1 0

[commit] r3301 - cpu/arm/olpc/cl4
by repository service Sept. 10, 2012

Sept. 10, 2012

Author: quozl Date: Mon Sep 10 13:33:13 2012 New Revision: 3301 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3301 Log: Q7A14 Modified: cpu/arm/olpc/cl4/fw-version.fth Modified: cpu/arm/olpc/cl4/fw-version.fth ============================================================================== --- cpu/arm/olpc/cl4/fw-version.fth Mon Sep 10 10:39:51 2012 (r3300) +++ cpu/arm/olpc/cl4/fw-version.fth Mon Sep 10 13:33:13 2012 (r3301) @@ -1,11 +1,10 @@ \ The overall firmware revision macro: FW_PREFIX Q7 macro: FW_MAJOR A -macro: FW_MINOR 13 +macro: FW_MINOR 14 \ Create a 2-character build/fw-suffix file to personalize your test builds " fw-suffix" $file-exists? [if] " fw-suffix" $read-file 2 min " ${FW_MINOR}%s" expand$ sprintf " FW_MINOR" $set-macro [then] -

1 0

[commit] r3300 - dev/olpc/spiflash
by repository service Sept. 10, 2012

Sept. 10, 2012

Author: quozl Date: Mon Sep 10 10:39:51 2012 New Revision: 3300 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3300 Log: OLPC XO-4 B1 - add new SPI FLASH ID 35 for MXIC 25U1635E Modified: dev/olpc/spiflash/spiflash.fth Modified: dev/olpc/spiflash/spiflash.fth ============================================================================== --- dev/olpc/spiflash/spiflash.fth Fri Sep 7 10:39:55 2012 (r3299) +++ dev/olpc/spiflash/spiflash.fth Mon Sep 10 10:39:51 2012 (r3300) @@ -308,7 +308,8 @@ h# 13 of ['] common-write endof h# 34 of ['] common-write endof h# bf of ['] sst-write endof - h# 14 of ['] common-write endof + h# 14 of ['] common-write endof + h# 35 of ['] common-write endof \ On some old board the ID would read as 14 when it should have been something else. \ On CL4, 14 is the expected ID. \ ." The SPI FLASH ID reads as 14. This is due to an infrequent hardware problem." cr

1 0

[commit] r3299 - cpu/arm/olpc
by repository service Sept. 7, 2012

Sept. 7, 2012

Author: quozl Date: Fri Sep 7 10:39:55 2012 New Revision: 3299 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3299 Log: OLPC XO-4 - Neonode, re-enable too-strong fail Modified: cpu/arm/olpc/nn-touchscreen.fth Modified: cpu/arm/olpc/nn-touchscreen.fth ============================================================================== --- cpu/arm/olpc/nn-touchscreen.fth Fri Sep 7 01:38:55 2012 (r3298) +++ cpu/arm/olpc/nn-touchscreen.fth Fri Sep 7 10:39:55 2012 (r3299) @@ -485,7 +485,6 @@ [ifdef] nn-fll \ forced LED levels test : test-fll-signal ( signal# signal-value led-level -- ) -[ifdef] nn-too-strong-is-fatal dup 0= if fault rot ." fail on axis signal " .d @@ -494,7 +493,6 @@ cr exit then -[then] dup h# c > if fault rot ." fail on axis signal " .d

1 0

[commit] r3298 - cpu/arm/olpc/cl4
by repository service Sept. 6, 2012

Sept. 6, 2012

Author: quozl Date: Fri Sep 7 01:38:55 2012 New Revision: 3298 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3298 Log: Q7A13 Modified: cpu/arm/olpc/cl4/fw-version.fth Modified: cpu/arm/olpc/cl4/fw-version.fth ============================================================================== --- cpu/arm/olpc/cl4/fw-version.fth Thu Sep 6 10:23:20 2012 (r3297) +++ cpu/arm/olpc/cl4/fw-version.fth Fri Sep 7 01:38:55 2012 (r3298) @@ -8,3 +8,4 @@ " fw-suffix" $read-file 2 min " ${FW_MINOR}%s" expand$ sprintf " FW_MINOR" $set-macro [then] +

1 0

[commit] r3297 - cpu/arm/olpc
by repository service Sept. 6, 2012

Sept. 6, 2012

Author: quozl Date: Thu Sep 6 10:23:20 2012 New Revision: 3297 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3297 Log: OLPC XO-4 - Neonode, adjacent axis tests, increase box array to cover used size for photodiode edges, remove debugging. Modified: cpu/arm/olpc/nn-touchscreen.fth Modified: cpu/arm/olpc/nn-touchscreen.fth ============================================================================== --- cpu/arm/olpc/nn-touchscreen.fth Thu Sep 6 10:11:52 2012 (r3296) +++ cpu/arm/olpc/nn-touchscreen.fth Thu Sep 6 10:23:20 2012 (r3297) @@ -736,13 +736,11 @@ 0 value dx 0 value dy -xleds yleds * constant /boxen +xleds 1+ yleds 1+ * constant /boxen create boxen /boxen allot \ non-zero means box is expected to be hit : 0boxen ( -- ) boxen /boxen erase ; -: >boxen ( bx by -- addr ) xleds * + - dup /boxen > if debug-me then - boxen + ; +: >boxen ( bx by -- addr ) xleds * + boxen + ; : dxdy ( xleds yleds -- ) 0boxen

1 0

[commit] r3296 - cpu/arm/olpc
by repository service Sept. 6, 2012

Sept. 6, 2012

Author: quozl Date: Thu Sep 6 10:11:52 2012 New Revision: 3296 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3296 Log: OLPC XO-4 - Neonode, double randomness of adjacent axis test, fix boxes test; many boxes could not be cleared, flush events and ignore buffered up event; to avoid old data on scribble and adjacent axis test, fix bug in watch-fss; was occasionally aborting due to touch event data seen in stream, source formatting; tabs to spaces. Modified: cpu/arm/olpc/nn-touchscreen.fth Modified: cpu/arm/olpc/nn-touchscreen.fth ============================================================================== --- cpu/arm/olpc/nn-touchscreen.fth Thu Sep 6 02:30:17 2012 (r3295) +++ cpu/arm/olpc/nn-touchscreen.fth Thu Sep 6 10:11:52 2012 (r3296) @@ -111,6 +111,10 @@ : deactivate ( -- ) h# 00 h# 01 h# ee 3 bytes-out h# 00 d# 20 anticipate +; + +: deconfigure ( -- ) + deactivate true to configure? ; @@ -130,8 +134,8 @@ no-data? if reset no-data? if - ." no response to reset" cr - pbuf-free false exit + ." no response to reset" cr + pbuf-free false exit then then ['] read-boot-complete catch if @@ -146,10 +150,15 @@ ; : close - deactivate + deconfigure pbuf-free ; +: flush + deconfigure + configure +; + : stream-poll? ( -- false | x y buttons true ) in? if \ FIXME: only handles one subpacket @@ -213,135 +222,135 @@ \ a trailing ? means this combination is untested string-array x-os - ," PD13 open?" \ 01 00 00 00 00 00 00 00 - ," PD14 open?" \ 02 00 00 00 00 00 00 00 - ," PD15 open?" \ 04 00 00 00 00 00 00 00 - ," PD16 open?" \ 08 00 00 00 00 00 00 00 - ," PD17 open?" \ 10 00 00 00 00 00 00 00 - ," PD18 open?" \ 20 00 00 00 00 00 00 00 - ," PD19 open?" \ 40 00 00 00 00 00 00 00 - ," PD20 open?" \ 80 00 00 00 00 00 00 00 - - ," PD21 open?" \ 00 01 00 00 00 00 00 00 - ," PD22 open?" \ 00 02 00 00 00 00 00 00 - ," PD23 open?" \ 00 04 00 00 00 00 00 00 - ," PD24 open?" \ 00 08 00 00 00 00 00 00 - ," PD25 open?" \ 00 10 00 00 00 00 00 00 - ," PD26 open?" \ 00 20 00 00 00 00 00 00 - ," PD27 open?" \ 00 40 00 00 00 00 00 00 - ," PD28 open?" \ 00 80 00 00 00 00 00 00 - - ," PD13 short" \ 00 00 01 00 00 00 00 00 - ," PD14 short" \ 00 00 02 00 00 00 00 00 - ," PD15 short" \ 00 00 04 00 00 00 00 00 - ," PD16 short" \ 00 00 08 00 00 00 00 00 - ," PD17 short" \ 00 00 10 00 00 00 00 00 - ," PD18 short" \ 00 00 20 00 00 00 00 00 - ," PD19 short" \ 00 00 40 00 00 00 00 00 - ," PD20 short" \ 00 00 80 00 00 00 00 00 - - ," PD21 short" \ 00 00 00 01 00 00 00 00 - ," PD22 short" \ 00 00 00 02 00 00 00 00 - ," PD23 short" \ 00 00 00 04 00 00 00 00 - ," PD24 short" \ 00 00 00 08 00 00 00 00 - ," PD25 short" \ 00 00 00 10 00 00 00 00 - ," PD26 short" \ 00 00 00 20 00 00 00 00 - ," PD27 short" \ 00 00 00 40 00 00 00 00 - ," PD28 short" \ 00 00 00 80 00 00 00 00 - - ," IR12 short" \ 00 00 00 00 01 00 00 00 - ," IR13 short" \ 00 00 00 00 02 00 00 00 - ," IR14 short" \ 00 00 00 00 04 00 00 00 - ," IR15 short" \ 00 00 00 00 08 00 00 00 - ," IR16 short" \ 00 00 00 00 10 00 00 00 - ," IR17 short" \ 00 00 00 00 20 00 00 00 - ," IR18 short" \ 00 00 00 00 40 00 00 00 - ," IR19 short" \ 00 00 00 00 80 00 00 00 - - ," IR20 short" \ 00 00 00 00 00 01 00 00 - ," IR21 short" \ 00 00 00 00 00 02 00 00 - ," IR22 short" \ 00 00 00 00 00 04 00 00 - ," IR23 short" \ 00 00 00 00 00 08 00 00 - ," IR24 short" \ 00 00 00 00 00 10 00 00 - ," IR25 short" \ 00 00 00 00 00 20 00 00 - ," IR26 short" \ 00 00 00 00 00 40 00 00 - ," reserved?" \ 00 00 00 00 00 80 00 00 - - ," IR12 open?" \ 00 00 00 00 00 00 01 00 - ," IR13 open?" \ 00 00 00 00 00 00 02 00 - ," IR14 open?" \ 00 00 00 00 00 00 04 00 - ," IR15 open?" \ 00 00 00 00 00 00 08 00 - ," IR16 open?" \ 00 00 00 00 00 00 10 00 - ," IR17 open?" \ 00 00 00 00 00 00 20 00 - ," IR18 open?" \ 00 00 00 00 00 00 40 00 - ," IR19 open?" \ 00 00 00 00 00 00 80 00 - - ," IR20 open?" \ 00 00 00 00 00 00 00 01 - ," IR21 open?" \ 00 00 00 00 00 00 00 02 - ," IR22 open?" \ 00 00 00 00 00 00 00 04 - ," IR23 open?" \ 00 00 00 00 00 00 00 08 - ," IR24 open?" \ 00 00 00 00 00 00 00 10 - ," IR25 open?" \ 00 00 00 00 00 00 00 20 - ," IR26 open?" \ 00 00 00 00 00 00 00 40 - ," reserved?" \ 00 00 00 00 00 00 00 80 + ," PD13 open?" \ 01 00 00 00 00 00 00 00 + ," PD14 open?" \ 02 00 00 00 00 00 00 00 + ," PD15 open?" \ 04 00 00 00 00 00 00 00 + ," PD16 open?" \ 08 00 00 00 00 00 00 00 + ," PD17 open?" \ 10 00 00 00 00 00 00 00 + ," PD18 open?" \ 20 00 00 00 00 00 00 00 + ," PD19 open?" \ 40 00 00 00 00 00 00 00 + ," PD20 open?" \ 80 00 00 00 00 00 00 00 + + ," PD21 open?" \ 00 01 00 00 00 00 00 00 + ," PD22 open?" \ 00 02 00 00 00 00 00 00 + ," PD23 open?" \ 00 04 00 00 00 00 00 00 + ," PD24 open?" \ 00 08 00 00 00 00 00 00 + ," PD25 open?" \ 00 10 00 00 00 00 00 00 + ," PD26 open?" \ 00 20 00 00 00 00 00 00 + ," PD27 open?" \ 00 40 00 00 00 00 00 00 + ," PD28 open?" \ 00 80 00 00 00 00 00 00 + + ," PD13 short" \ 00 00 01 00 00 00 00 00 + ," PD14 short" \ 00 00 02 00 00 00 00 00 + ," PD15 short" \ 00 00 04 00 00 00 00 00 + ," PD16 short" \ 00 00 08 00 00 00 00 00 + ," PD17 short" \ 00 00 10 00 00 00 00 00 + ," PD18 short" \ 00 00 20 00 00 00 00 00 + ," PD19 short" \ 00 00 40 00 00 00 00 00 + ," PD20 short" \ 00 00 80 00 00 00 00 00 + + ," PD21 short" \ 00 00 00 01 00 00 00 00 + ," PD22 short" \ 00 00 00 02 00 00 00 00 + ," PD23 short" \ 00 00 00 04 00 00 00 00 + ," PD24 short" \ 00 00 00 08 00 00 00 00 + ," PD25 short" \ 00 00 00 10 00 00 00 00 + ," PD26 short" \ 00 00 00 20 00 00 00 00 + ," PD27 short" \ 00 00 00 40 00 00 00 00 + ," PD28 short" \ 00 00 00 80 00 00 00 00 + + ," IR12 short" \ 00 00 00 00 01 00 00 00 + ," IR13 short" \ 00 00 00 00 02 00 00 00 + ," IR14 short" \ 00 00 00 00 04 00 00 00 + ," IR15 short" \ 00 00 00 00 08 00 00 00 + ," IR16 short" \ 00 00 00 00 10 00 00 00 + ," IR17 short" \ 00 00 00 00 20 00 00 00 + ," IR18 short" \ 00 00 00 00 40 00 00 00 + ," IR19 short" \ 00 00 00 00 80 00 00 00 + + ," IR20 short" \ 00 00 00 00 00 01 00 00 + ," IR21 short" \ 00 00 00 00 00 02 00 00 + ," IR22 short" \ 00 00 00 00 00 04 00 00 + ," IR23 short" \ 00 00 00 00 00 08 00 00 + ," IR24 short" \ 00 00 00 00 00 10 00 00 + ," IR25 short" \ 00 00 00 00 00 20 00 00 + ," IR26 short" \ 00 00 00 00 00 40 00 00 + ," reserved?" \ 00 00 00 00 00 80 00 00 + + ," IR12 open?" \ 00 00 00 00 00 00 01 00 + ," IR13 open?" \ 00 00 00 00 00 00 02 00 + ," IR14 open?" \ 00 00 00 00 00 00 04 00 + ," IR15 open?" \ 00 00 00 00 00 00 08 00 + ," IR16 open?" \ 00 00 00 00 00 00 10 00 + ," IR17 open?" \ 00 00 00 00 00 00 20 00 + ," IR18 open?" \ 00 00 00 00 00 00 40 00 + ," IR19 open?" \ 00 00 00 00 00 00 80 00 + + ," IR20 open?" \ 00 00 00 00 00 00 00 01 + ," IR21 open?" \ 00 00 00 00 00 00 00 02 + ," IR22 open?" \ 00 00 00 00 00 00 00 04 + ," IR23 open?" \ 00 00 00 00 00 00 00 08 + ," IR24 open?" \ 00 00 00 00 00 00 00 10 + ," IR25 open?" \ 00 00 00 00 00 00 00 20 + ," IR26 open?" \ 00 00 00 00 00 00 00 40 + ," reserved?" \ 00 00 00 00 00 00 00 80 end-string-array string-array y-os - ," PD4 open?" \ 01 00 00 00 00 00 - ," PD3 open?" \ 02 00 00 00 00 00 - ," PD2 open?" \ 04 00 00 00 00 00 - ," PD1 open?" \ 08 00 00 00 00 00 - ," PD12 open?" \ 10 00 00 00 00 00 - ," PD11 open?" \ 20 00 00 00 00 00 - ," PD10 open?" \ 40 00 00 00 00 00 - ," PD9 open?" \ 80 00 00 00 00 00 - - ," PD8 open?" \ 00 01 00 00 00 00 - ," PD7 open?" \ 00 02 00 00 00 00 - ," PD6 open?" \ 00 04 00 00 00 00 - ," PD5 open?" \ 00 08 00 00 00 00 - ," PD12 short" \ 00 10 00 00 00 00 - ," PD11 short" \ 00 20 00 00 00 00 - ," PD10 short" \ 00 40 00 00 00 00 - ," PD9 short" \ 00 80 00 00 00 00 - - ," PD8 short" \ 00 00 01 00 00 00 - ," PD7 short" \ 00 00 02 00 00 00 - ," PD6 short" \ 00 00 04 00 00 00 - ," PD5 short" \ 00 00 08 00 00 00 - ," PD4 short" \ 00 00 10 00 00 00 - ," PD3 short" \ 00 00 20 00 00 00 - ," PD2 short" \ 00 00 40 00 00 00 - ," PD1 short" \ 00 00 80 00 00 00 - - ," IR11 short" \ 00 00 00 01 00 00 - ," IR10 short" \ 00 00 00 02 00 00 - ," IR9 short" \ 00 00 00 04 00 00 - ," IR8 short" \ 00 00 00 08 00 00 - ," IR7 short" \ 00 00 00 10 00 00 - ," IR6 short" \ 00 00 00 20 00 00 - ," IR5 short" \ 00 00 00 40 00 00 - ," IR4 short" \ 00 00 00 80 00 00 - - ," IR3 short" \ 00 00 00 00 01 00 - ," IR2 short" \ 00 00 00 00 02 00 - ," IR1 short" \ 00 00 00 00 04 00 - ," reserved?" \ 00 00 00 00 08 00 - ," reserved?" \ 00 00 00 00 10 00 - ," IR11 open?" \ 00 00 00 00 20 00 - ," IR10 open?" \ 00 00 00 00 40 00 - ," IR9 open?" \ 00 00 00 00 80 00 - - ," IR8 open?" \ 00 00 00 00 00 01 - ," IR7 open?" \ 00 00 00 00 00 02 - ," IR6 open?" \ 00 00 00 00 00 04 - ," IR5 open?" \ 00 00 00 00 00 08 - ," IR4 open?" \ 00 00 00 00 00 10 - ," IR3 open?" \ 00 00 00 00 00 20 - ," IR2 open?" \ 00 00 00 00 00 40 - ," IR1 open?" \ 00 00 00 00 00 80 + ," PD4 open?" \ 01 00 00 00 00 00 + ," PD3 open?" \ 02 00 00 00 00 00 + ," PD2 open?" \ 04 00 00 00 00 00 + ," PD1 open?" \ 08 00 00 00 00 00 + ," PD12 open?" \ 10 00 00 00 00 00 + ," PD11 open?" \ 20 00 00 00 00 00 + ," PD10 open?" \ 40 00 00 00 00 00 + ," PD9 open?" \ 80 00 00 00 00 00 + + ," PD8 open?" \ 00 01 00 00 00 00 + ," PD7 open?" \ 00 02 00 00 00 00 + ," PD6 open?" \ 00 04 00 00 00 00 + ," PD5 open?" \ 00 08 00 00 00 00 + ," PD12 short" \ 00 10 00 00 00 00 + ," PD11 short" \ 00 20 00 00 00 00 + ," PD10 short" \ 00 40 00 00 00 00 + ," PD9 short" \ 00 80 00 00 00 00 + + ," PD8 short" \ 00 00 01 00 00 00 + ," PD7 short" \ 00 00 02 00 00 00 + ," PD6 short" \ 00 00 04 00 00 00 + ," PD5 short" \ 00 00 08 00 00 00 + ," PD4 short" \ 00 00 10 00 00 00 + ," PD3 short" \ 00 00 20 00 00 00 + ," PD2 short" \ 00 00 40 00 00 00 + ," PD1 short" \ 00 00 80 00 00 00 + + ," IR11 short" \ 00 00 00 01 00 00 + ," IR10 short" \ 00 00 00 02 00 00 + ," IR9 short" \ 00 00 00 04 00 00 + ," IR8 short" \ 00 00 00 08 00 00 + ," IR7 short" \ 00 00 00 10 00 00 + ," IR6 short" \ 00 00 00 20 00 00 + ," IR5 short" \ 00 00 00 40 00 00 + ," IR4 short" \ 00 00 00 80 00 00 + + ," IR3 short" \ 00 00 00 00 01 00 + ," IR2 short" \ 00 00 00 00 02 00 + ," IR1 short" \ 00 00 00 00 04 00 + ," reserved?" \ 00 00 00 00 08 00 + ," reserved?" \ 00 00 00 00 10 00 + ," IR11 open?" \ 00 00 00 00 20 00 + ," IR10 open?" \ 00 00 00 00 40 00 + ," IR9 open?" \ 00 00 00 00 80 00 + + ," IR8 open?" \ 00 00 00 00 00 01 + ," IR7 open?" \ 00 00 00 00 00 02 + ," IR6 open?" \ 00 00 00 00 00 04 + ," IR5 open?" \ 00 00 00 00 00 08 + ," IR4 open?" \ 00 00 00 00 00 10 + ," IR3 open?" \ 00 00 00 00 00 20 + ," IR2 open?" \ 00 00 00 00 00 40 + ," IR1 open?" \ 00 00 00 00 00 80 end-string-array @@ -362,30 +371,30 @@ pbuf 3 + c@ if pbuf 4 + c@ h# 16 <> abort" bad signals y" [ifdef] nn-components - ['] y-os to our-os + ['] y-os to our-os [then] /y-os ( addr bits# ) else pbuf 4 + c@ h# 1e <> abort" bad signals x" [ifdef] nn-components - ['] x-os to our-os + ['] x-os to our-os [then] /x-os ( addr bits# ) then - 0 do ( addr ) - dup c@ ( addr byte ) - i 8 mod ( addr byte bit# ) - rshift 1 and if ( addr ) - 8sp - [ifdef] nn-components - i our-os count type - [then] - ." ( bit " i .d ." )" cr - fault - then ( addr ) - i 8 mod 7 = if 1+ then ( addr' ) - loop drop ( ) + 0 do ( addr ) + dup c@ ( addr byte ) + i 8 mod ( addr byte bit# ) + rshift 1 and if ( addr ) + 8sp + [ifdef] nn-components + i our-os count type + [then] + ." ( bit " i .d ." )" cr + fault + then ( addr ) + i 8 mod 7 = if 1+ then ( addr' ) + loop drop ( ) cr ; @@ -454,8 +463,8 @@ dup c@ ( addr byte ) i 8 mod ( addr byte bit# ) rshift 1 and if ( addr ) - i .d - fault + i .d + fault then i 8 mod ( addr rem ) 7 = if 1+ then ( addr' ) @@ -476,6 +485,7 @@ [ifdef] nn-fll \ forced LED levels test : test-fll-signal ( signal# signal-value led-level -- ) +[ifdef] nn-too-strong-is-fatal dup 0= if fault rot ." fail on axis signal " .d @@ -484,6 +494,7 @@ cr exit then +[then] dup h# c > if fault rot ." fail on axis signal " .d @@ -626,7 +637,7 @@ : watch-fss-axis ( axis# -- ) dup to axis# ( axis# ) fs swap h# 0f h# 03 h# ee 5 bytes-out - h# 0f d# 20 anticipate + h# 0f d# 200 anticipate pbuf 4 + c@ 0 do ( ) i pbuf 5 + over + c@ ( signal# level ) @@ -684,8 +695,13 @@ pbuf 4 + i 9 * + >r ( r:addr ) r@ w@ x>x' ( x r:addr ) r@ wa1+ w@ ( x y r:addr ) - r> 4 + c@ 2 rshift setcolor ( x y ) - (ev) ( ) + r> 4 + c@ ( x y id-state ) + dup 2 rshift setcolor ( x y id-state ) + 3 and 2 <> if ( x y ) + (ev) ( ) \ not an up event + else + 2drop ( ) \ an up event + then loop then then ( to ) @@ -700,7 +716,7 @@ configure cursor-off consume - begin in? 0= until + flush background -1 to remaining ; @@ -724,7 +740,7 @@ create boxen /boxen allot \ non-zero means box is expected to be hit : 0boxen ( -- ) boxen /boxen erase ; -: >boxen ( bx by -- addr ) yleds * + +: >boxen ( bx by -- addr ) xleds * + dup /boxen > if debug-me then boxen + ; @@ -744,9 +760,9 @@ ; : box ( bx by colour -- ) - -rot ( colour bx by ) - bxby>xy ( colour x y ) - dx dy ( colour x y w h ) + -rot ( colour bx by ) + bxby>xy ( colour x y ) + dx dy ( colour x y w h ) fill-rectangle-noff ; @@ -769,7 +785,7 @@ : unhit-all ( -- ) xleds 0 do yleds 0 do - j i unhit + j i unhit loop loop ; @@ -813,12 +829,16 @@ : ra ['] .ra to .tsmsg ev( ra0 ['] (ra) ev )ev r-fault? ; : test-adjacent-axes - get-msecs 3 and \ pick random corner + get-msecs 7 and \ pick random corner case 0 of ta ra exit endof 1 of ra ba exit endof 2 of ba la exit endof 3 of la ta exit endof + 4 of ra ta exit endof + 5 of ba ra exit endof + 6 of la ba exit endof + 7 of ta la exit endof endcase ;

1 0