December 2012 - openfirmware - mail.coreboot.org

[commit] r3475 - dev
by repository service Dec. 6, 2012

Dec. 6, 2012

Author: wmb Date: Thu Dec 6 22:15:34 2012 New Revision: 3475 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3475 Log: EDID decoder - (a) Fixed crash due to typo of " for ." (b) Fixed spurious + in audio decoding. Modified: dev/edid.fth Modified: dev/edid.fth ============================================================================== --- dev/edid.fth Thu Dec 6 08:03:54 2012 (r3474) +++ dev/edid.fth Thu Dec 6 22:15:34 2012 (r3475) @@ -141,21 +141,21 @@ \ Audio sample rates : .cea-freqs ( n -- ) - peel-bit if ." 32" then ?.+ - peel-bit if ." 44" then ?.+ - peel-bit if ." 48" then ?.+ - peel-bit if ." 88" then ?.+ - peel-bit if ." 96" then ?.+ - peel-bit if ." 176" then ?.+ - peel-bit if ." 192" then drop - ." kHz" + peel-bit if ." 32" ?.+ then + peel-bit if ." 44" ?.+ then + peel-bit if ." 48" ?.+ then + peel-bit if ." 88" ?.+ then + peel-bit if ." 96" ?.+ then + peel-bit if ." 176" ?.+ then + peel-bit if ." 192" then + ." kHz" drop ; \ Audio sample widths : .cea-bits ( n -- ) - peel-bit if ." 16" then ?.+ - peel-bit if ." 20" then ?.+ - peel-bit if ." 24" then drop - ." bits" + peel-bit if ." 16" ?.+ then + peel-bit if ." 20" ?.+ then + peel-bit if ." 24" then + ." bits" drop ; string-array format-names @@ -284,13 +284,13 @@ \ rest is history. : .cea-speaker ( offset size -- ) drop cea@ - peel-bit if " Front_L+R " then \ Stereo - peel-bit if " LFE " then \ Subwoofer makes 2.1 - peel-bit if " Front_Center " then \ Center fill makes 3.1 - peel-bit if " Rear_L+R " then \ Ambience makes 5.1 - peel-bit if " Rear_Center " then \ 7.1 ... - peel-bit if " Front_Center_L+R " then \ How many speakers do they want to sell you? - peel-bit if " Rear_Center_L+R " then \ How can you live without twelve speakers? + peel-bit if ." Front_L+R " then \ Stereo + peel-bit if ." LFE " then \ Subwoofer makes 2.1 + peel-bit if ." Front_Center " then \ Center fill makes 3.1 + peel-bit if ." Rear_L+R " then \ Ambience makes 5.1 + peel-bit if ." Rear_Center " then \ 7.1 ... + peel-bit if ." Front_Center_L+R " then \ How many speakers do they want to sell you? + peel-bit if ." Rear_Center_L+R " then \ How can you live without twelve speakers? drop ;

1 0

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

Dec. 6, 2012

Author: quozl Date: Thu Dec 6 08:03:54 2012 New Revision: 3474 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3474 Log: OLPC XO-4 - restore mouse cursor over suspend test, for #12362. Modified: cpu/arm/olpc/cl4/testitems.fth Modified: cpu/arm/olpc/cl4/testitems.fth ============================================================================== --- cpu/arm/olpc/cl4/testitems.fth Thu Dec 6 07:55:54 2012 (r3473) +++ cpu/arm/olpc/cl4/testitems.fth Thu Dec 6 08:03:54 2012 (r3474) @@ -43,8 +43,12 @@ ?open-touchscreen ; : keyboard-item ( -- ) " keyboard" mfg-test-dev ; -: switch-item ( -- ) " /accelerometer" mfg-test-dev - " /switches" mfg-test-dev ; +: switch-item ( -- ) + " /accelerometer" mfg-test-dev + ?close-mouse + " /switches" mfg-test-dev + ?open-mouse +; : leds-item ( -- ) " /leds" mfg-test-dev ; : olpc-test-menu-items ( -- )

1 0

[commit] r3473 - in cpu/arm/olpc: . cl4
by repository service Dec. 6, 2012

Dec. 6, 2012

Author: quozl Date: Thu Dec 6 07:55:54 2012 New Revision: 3473 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3473 Log: OLPC XO-4 - touchscreen and menu interaction, add reference counting to open/close, clean the buffer in stream-poll? so that previous events are not processed again, fix stack effect of selftest, close and reopen the touchscreen over the menu driven test of the touchscreen (not the best solution), all this for #12357. Modified: cpu/arm/olpc/cl4/testitems.fth cpu/arm/olpc/nn-touchscreen.fth Modified: cpu/arm/olpc/cl4/testitems.fth ============================================================================== --- cpu/arm/olpc/cl4/testitems.fth Thu Dec 6 05:50:29 2012 (r3472) +++ cpu/arm/olpc/cl4/testitems.fth Thu Dec 6 07:55:54 2012 (r3473) @@ -34,8 +34,14 @@ : camera-item ( -- ) " /camera" gfx-test-dev ; : wlan-item ( -- ) " /wlan" mfg-test-dev ; : timer-item ( -- ) " /timer" mfg-test-dev ; -: touch-item ( -- ) " /touchscreen" mfg-test-dev - " mouse" mfg-test-dev ; +: touch-item ( -- ) + ?close-touchscreen + ?close-mouse + " /touchscreen" mfg-test-dev + " mouse" mfg-test-dev + ?open-mouse + ?open-touchscreen +; : keyboard-item ( -- ) " keyboard" mfg-test-dev ; : switch-item ( -- ) " /accelerometer" mfg-test-dev " /switches" mfg-test-dev ; Modified: cpu/arm/olpc/nn-touchscreen.fth ============================================================================== --- cpu/arm/olpc/nn-touchscreen.fth Thu Dec 6 05:50:29 2012 (r3472) +++ cpu/arm/olpc/nn-touchscreen.fth Thu Dec 6 07:55:54 2012 (r3473) @@ -157,35 +157,43 @@ then ; +variable refcount 0 refcount ! + : open ( -- okay? ) - pbuf-alloc my-unit " set-address" $call-parent - set-gpios - no-data? if - reset + refcount @ 0= if + pbuf-alloc + set-gpios no-data? if - ." no response to reset" cr - pbuf-free false exit + reset + no-data? if + ." no response to reset" cr + pbuf-free false exit + then + ['] read-boot-complete catch ?dup if + .error + ." failed to boot" cr + pbuf-free false exit + then + else + flush-input then - ['] read-boot-complete catch ?dup if + ['] configure catch ?dup if .error - ." failed to boot" cr + ." failed to configure" cr pbuf-free false exit then - else - flush-input - then - ['] configure catch ?dup if - .error - ." failed to configure" cr - pbuf-free false exit then + refcount @ 1+ refcount ! true ; : close - deconfigure - pbuf-free + refcount @ 1- 0 max refcount ! + refcount @ 0= if + deconfigure + pbuf-free + then ; : flush @@ -194,6 +202,7 @@ ; : stream-poll? ( -- false | x y buttons true ) + 0 pbuf 2+ c! in? if \ FIXME: only handles one subpacket pbuf 2+ c@ h# 04 = if @@ -1041,7 +1050,8 @@ ['] open catch ?dup if .error ." No touchscreen present" cr false exit - then + then ( okay? ) + 0= if false exit then diagnostic-mode? if 0 to faults

1 0

[commit] r3472 - dev/olpc/kb3700
by repository service Dec. 6, 2012

Dec. 6, 2012

Author: quozl Date: Thu Dec 6 05:50:29 2012 New Revision: 3472 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3472 Log: OLPC XO-4 - add EC 16-bit battery status command so that cooling bit can be displayed Modified: dev/olpc/kb3700/eccmdcom.fth Modified: dev/olpc/kb3700/eccmdcom.fth ============================================================================== --- dev/olpc/kb3700/eccmdcom.fth Wed Dec 5 09:02:09 2012 (r3471) +++ dev/olpc/kb3700/eccmdcom.fth Thu Dec 6 05:50:29 2012 (r3472) @@ -7,7 +7,7 @@ : bat-acr@ ( -- w ) h# 12 ec-cmd-w@ ; : bat-temp@ ( -- w ) h# 13 ec-cmd-w@ ; : ambient-temp@ ( -- w ) h# 14 ec-cmd-w@ ; -: bat-status@ ( -- b ) h# 15 ec-cmd-b@ ; +: bat-status8@ ( -- b ) h# 15 ec-cmd-b@ ; : bat-soc@ ( -- b ) h# 16 ec-cmd-b@ ; : ec-abnormal@ ( -- b ) h# 1f ec-cmd-b@ ; @@ -23,6 +23,15 @@ : mppt-off ( -- ) h# 40 ec-cmd ; : mppt-on ( -- ) h# 41 ec-cmd ; : vin@ ( -- b ) h# 42 ec-cmd-w@ ; +: bat-status16@ ( -- w ) h# 70 ec-cmd-w@ ; + +defer bat-status@ +' bat-status8@ is bat-status@ + +[ifdef] olpc-xo4 +' bat-status16@ is bat-status@ +[then] + \ LICENSE_BEGIN \ Copyright (c) 2010 FirmWorks

1 0

[commit] r3471 - dev/usb2/device/serial
by repository service Dec. 5, 2012

Dec. 5, 2012

Author: quozl Date: Wed Dec 5 09:02:09 2012 New Revision: 3471 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3471 Log: usbserial - FTDI232 driver for OLPC serial adapters Modified: dev/usb2/device/serial/common.fth dev/usb2/device/serial/ftdi.fth dev/usb2/device/serial/uart.fth dev/usb2/device/serial/usbserial.bth dev/usb2/device/serial/vendor.fth Modified: dev/usb2/device/serial/common.fth ============================================================================== --- dev/usb2/device/serial/common.fth Wed Dec 5 04:44:52 2012 (r3470) +++ dev/usb2/device/serial/common.fth Wed Dec 5 09:02:09 2012 (r3471) @@ -107,6 +107,29 @@ ; ' generic-rpoll to rpoll +[ifndef] /string +: /string ( adr len cnt -- adr' len' ) tuck - -rot + swap ; +[then] + +: generic-read-bytes ( adr len -- #read ) \ -2 for none available right now + rpoll + dup 0= if nip exit then ( adr len ) + read-q deque? 0= if ( adr len ) + 2drop ( ) + lost-carrier? if -1 false to lost-carrier? else -2 then + ( -2:none | -1:down ) + exit + then ( adr len char ) + over >r ( adr len char r: len ) + begin ( adr len char r: len ) + 2 pick c! ( adr len r: len ) + 1 /string ( adr' len' ) + dup 0= if 2drop r> exit then ( adr' len' ) + read-q deque? 0= until ( adr len r: len ) + nip r> swap - ( actual ) +; +' generic-read-bytes to read-bytes + : generic-write-bytes ( adr len -- actual ) swap >r ( len ) ( R: adr ) /outbuf /mod ( rem #loop ) Modified: dev/usb2/device/serial/ftdi.fth ============================================================================== --- dev/usb2/device/serial/ftdi.fth Wed Dec 5 04:44:52 2012 (r3470) +++ dev/usb2/device/serial/ftdi.fth Wed Dec 5 09:02:09 2012 (r3471) @@ -20,10 +20,14 @@ : ftdi-flush-rx ( -- ) 0 1 ftdi-set ; : ftdi-flush-tx ( -- ) 0 2 ftdi-set ; +[ifndef] rounded-/ +: rounded-/ swap 2* swap / dup 1 and + 2/ ; +[then] + : ftdi-baud ( baud -- ) \ There are some high bits for fractional divisors that we don't use d# 48000000 swap rounded-/ ( divisor ) - 0 swap 3 ftdi-set + 4 rshift 3 ftdi-set ; : ftdi-modem-ctl ( code -- ) 1 ftdi-set ; @@ -69,4 +73,73 @@ \ If there is any real data, it will be returned in bytes 2, ... \ If there is no data, 2-byte status messages are sent every 40 ms. +: ftdi-rpoll ( -- ) + bulk-in? if drop restart-bulk-in exit then \ USB error; restart + ?dup if + 2 ?do + inbuf i ca+ c@ read-q enque + loop + restart-bulk-in + then +; + \ Data is transmitted on bulk endpoint 2, verbatim. + +: ftdi-rts-dtr-off ( -- ) + ftdi-rts-off + ftdi-dtr-off +; + +: ftdi-rts-dtr-on ( -- ) + ftdi-rts-on + ftdi-dtr-on +; + +: ftdi-set-baud ( -- ) + d# 115200 ftdi-baud + ftdi-rts-dtr-on + ftdi-8n1 + ftdi-flow-none +; + +: ftdi-inituart ( -- ) + ftdi-set-baud +; + + +: init-ftdi ( -- ) + ['] ftdi-rts-dtr-off to rts-dtr-off + ['] ftdi-rts-dtr-on to rts-dtr-on + ['] ftdi-rpoll to rpoll + ['] ftdi-inituart to inituart +; + +: init ( -- ) + init + vid pid uart-ftdi? if init-ftdi then +; + + +\ LICENSE_BEGIN +\ Copyright (c) 2012 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 Modified: dev/usb2/device/serial/uart.fth ============================================================================== --- dev/usb2/device/serial/uart.fth Wed Dec 5 04:44:52 2012 (r3470) +++ dev/usb2/device/serial/uart.fth Wed Dec 5 09:02:09 2012 (r3471) @@ -11,8 +11,6 @@ variable refcount 0 refcount ! -: /string ( adr len cnt -- adr' len' ) tuck - -rot + swap ; - \ Don't do this until someone calls read. That makes the device \ work as a console, with separate input and output instances 0 value read-started? @@ -32,21 +30,7 @@ \ no more characters are immediately available. : read ( adr len -- #read ) \ -2 for none available right now ?start-reading - rpoll - dup 0= if nip exit then ( adr len ) - read-q deque? 0= if ( adr len ) - 2drop ( ) - lost-carrier? if -1 false to lost-carrier? else -2 then - ( -2:none | -1:down ) - exit - then ( adr len char ) - over >r ( adr len char r: len ) - begin ( adr len char r: len ) - 2 pick c! ( adr len r: len ) - 1 /string ( adr' len' ) - dup 0= if 2drop r> exit then ( adr' len' ) - read-q deque? 0= until ( adr len r: len ) - nip r> swap - ( actual ) + read-bytes ; : write ( adr len -- actual ) dup if write-bytes else nip then ; Modified: dev/usb2/device/serial/usbserial.bth ============================================================================== --- dev/usb2/device/serial/usbserial.bth Wed Dec 5 04:44:52 2012 (r3470) +++ dev/usb2/device/serial/usbserial.bth Wed Dec 5 09:02:09 2012 (r3471) @@ -16,6 +16,7 @@ fload ${BP}/dev/usb2/device/serial/belkin.fth \ Belkin device routines fload ${BP}/dev/usb2/device/serial/mct_u232.fth \ MCT U232 device routines fload ${BP}/dev/usb2/device/serial/pl2303.fth \ PL2303 device routines +fload ${BP}/dev/usb2/device/serial/ftdi.fth \ FTDI device routines fload ${BP}/dev/usb2/device/serial/uart.fth \ USB uart driver end0 Modified: dev/usb2/device/serial/vendor.fth ============================================================================== --- dev/usb2/device/serial/vendor.fth Wed Dec 5 04:44:52 2012 (r3470) +++ dev/usb2/device/serial/vendor.fth Wed Dec 5 09:02:09 2012 (r3471) @@ -7,6 +7,10 @@ 525 w, 127a w, \ Ajays USB 2.0 Debug Cable here swap - constant /uart-generic-list +create uart-ftdi-list here + 403 w, 6001 w, \ FT232 +here swap - constant /uart-ftdi-list + create uart-pl2303-list here 557 w, 2008 w, \ ATEN, IOGear 67b w, 2303 w, \ PL2303 @@ -33,6 +37,9 @@ uart-generic-list /uart-generic-list find-vendor-product? ; +: uart-ftdi? ( vid pid -- flag ) + uart-ftdi-list /uart-ftdi-list find-vendor-product? +; : uart-pl2303? ( vid pid -- flag ) uart-pl2303-list /uart-pl2303-list find-vendor-product? @@ -47,7 +54,8 @@ ; : usb-uart? ( vid pid -- flag ) - 2dup uart-pl2303? if 2drop true exit then + 2dup uart-ftdi? if 2drop true exit then + 2dup uart-pl2303? if 2drop true exit then \ Not debugged yet... \ 2dup uart-mct? if 2drop true exit then 2dup uart-belkin? if 2drop true exit then

1 0

[commit] r3470 - dev/usb2/device/serial
by repository service Dec. 5, 2012

Dec. 5, 2012

Author: wmb Date: Wed Dec 5 04:44:52 2012 New Revision: 3470 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3470 Log: Start of a driver for FTDI serial chips. Needs fleshing out. Added: dev/usb2/device/serial/ftdi.fth Added: dev/usb2/device/serial/ftdi.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ dev/usb2/device/serial/ftdi.fth Wed Dec 5 04:44:52 2012 (r3470) @@ -0,0 +1,72 @@ +purpose: Driver for FTDI USB serial chips + +8 buffer: ftdi-buf + +0 value ftdi-port \ 0 for single-interface devices and SIOA, 1 for SIOB, 2 for parallel port + +\ Helper function +: ftdi-set ( value request -- ) + >r >r 0 0 ftdi-port r> h# 40 r> control-set drop +; + +\ Read internal registers +: ftdi@ ( index -- w ) + >r ftdi-buf 2 r> 0 h# c0 h# 90 control-get 2drop + ftdi-buf c@ ftdi-buf 1+ c@ bwjoin +; + +\ Various resets +: ftdi-reset ( -- ) 0 0 ftdi-set ; +: ftdi-flush-rx ( -- ) 0 1 ftdi-set ; +: ftdi-flush-tx ( -- ) 0 2 ftdi-set ; + +: ftdi-baud ( baud -- ) + \ There are some high bits for fractional divisors that we don't use + d# 48000000 swap rounded-/ ( divisor ) + 0 swap 3 ftdi-set +; + +: ftdi-modem-ctl ( code -- ) 1 ftdi-set ; +: ftdi-rts-on ( -- ) h# 202 ftdi-modem-ctl ; +: ftdi-rts-off ( -- ) h# 200 ftdi-modem-ctl ; +: ftdi-dtr-on ( -- ) h# 101 ftdi-modem-ctl ; +: ftdi-dtr-off ( -- ) h# 100 ftdi-modem-ctl ; + +: ftdi-flow-ctl ( code -- ) 2 ftdi-set ; +: ftdi-flow-none ( -- ) 0 ftdi-flow-ctl ; +: ftdi-flow-rts-cts ( -- ) h# 100 ftdi-flow-ctl ; +: ftdi-flow-dtr-dsr ( -- ) h# 200 ftdi-flow-ctl ; +: ftdi-flow-xon-xoff ( -- ) h# 400 ftdi-flow-ctl ; + +\ h# 800 for 1.5 stop bits, h# 1000 for 2 stop bits +\ h# 300 for mark parity, h# 400 for space parity +: ftdi-data ( code -- ) 4 ftdi-set ; +: ftdi-8n1 ( -- ) 8 ftdi-data ; +\ : ftdi-8o1 ( -- ) h# 18 ftdi-data ; +\ : ftdi-8e1 ( -- ) h# 28 ftdi-data ; +\ : ftdi-7e1 ( -- ) h# 27 ftdi-data ; +\ : ftdi-7o1 ( -- ) h# 17 ftdi-data ; + +: ftdi-break-on ( -- ) h# 4000 ftdi-data ; +\ To send a break, I suppose that you do ftdi-break-on, delay awhile, +\ then ftdi-8n1 or whatever your data format is. + +\ Commands that we're unlikely to need +\ : ftdi-set-event-char ( char -- ) 6 ftdi-set ; +\ : ftdi-set-error-char ( char -- ) 7 ftdi-set ; +\ : ftdi-set-latency ( ms -- ) 9 ftdi-set ; + +\ CTS: 10 DSR: 20 RI: 40 CD: 80 +\ DR: 100 OR: 200 PE: 400 FE: 800 Break: 1000 THRE: 2000 TE: 4000 RXERR: 8000 +: ftdi-modem@ ( -- status ) + ftdi-buf 2 ftdi-port 0 h# c0 5 control-get 2drop + ftdi-buf c@ ftdi-buf 1+ c@ bwjoin +; + +\ Data is received on bulk endpoint 1 +\ Byte 0 is modem status (CTS - CD as above) +\ Byte 1 is line status (DR - RXERR as above) +\ If there is any real data, it will be returned in bytes 2, ... +\ If there is no data, 2-byte status messages are sent every 40 ms. + +\ Data is transmitted on bulk endpoint 2, verbatim.

1 0

[commit] r3469 - cpu/arm/olpc/4.0
by repository service Dec. 4, 2012

Dec. 4, 2012

Author: rsmith Date: Tue Dec 4 21:21:48 2012 New Revision: 3469 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3469 Log: OLPC XO-4 - EC Code 0.3.05 Modified: cpu/arm/olpc/4.0/ec-version.fth Modified: cpu/arm/olpc/4.0/ec-version.fth ============================================================================== --- cpu/arm/olpc/4.0/ec-version.fth Mon Dec 3 08:07:43 2012 (r3468) +++ cpu/arm/olpc/4.0/ec-version.fth Tue Dec 4 21:21:48 2012 (r3469) @@ -1,6 +1,6 @@ \ The EC microcode macro: EC_PLATFORM cl4 -macro: EC_VERSION 7_0_3_04 +macro: EC_VERSION 7_0_3_05 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary

1 0

[commit] r3468 - cpu/arm/olpc
by repository service Dec. 3, 2012

Dec. 3, 2012

Author: wmb Date: Mon Dec 3 08:07:43 2012 New Revision: 3468 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3468 Log: OLPC XO-4 - Improved access methods for HDMI EDID info. Modified: cpu/arm/olpc/gpio-i2c.fth Modified: cpu/arm/olpc/gpio-i2c.fth ============================================================================== --- cpu/arm/olpc/gpio-i2c.fth Mon Dec 3 08:05:56 2012 (r3467) +++ cpu/arm/olpc/gpio-i2c.fth Mon Dec 3 08:07:43 2012 (r3468) @@ -42,7 +42,7 @@ 0 0 encode-bytes cam-sda-gpio# 0 encode-gpio - cam-scl-gpio# 0 encode-gpio + cam-scl-gpio# 0 encode-gpio " gpios" property 0 instance value slave-address @@ -144,22 +144,59 @@ " hdmi-ddc" device-name h# 50 1 reg : close ( -- ) ; - h# 100 buffer: hdmi-edid - - : get-edid ( -- adr len ) - hdmi-edid h# 100 0 " i2c-read" $call-parent - hdmi-edid h# 100 + h# 80 constant /edid-chunk + 0 value edid + 0 value /edid + + : release-edid ( -- ) + edid /edid free-mem ( ) + 0 to /edid 0 to edid ( ) ; + : open ( -- okay? ) my-unit " set-address" $call-parent - hdmi-edid h# 100 0 " i2c-read" ['] $call-parent catch if - 2drop 3drop false - else - true + /edid-chunk to /edid + /edid alloc-mem to edid + + edid /edid 0 " i2c-read" ['] $call-parent catch if ( x x x x x ) + 2drop 3drop ( ) + release-edid false exit ( -- false ) + then + + \ Basic sanity check to make sure it's an EDID + edid " "(00ffffffffffff00)" comp if ( ) + release-edid false exit ( -- false ) then + + \ We could (should) do a checksum here... + + \ If there are no extensions, exit now, successfully + edid d# 126 + c@ dup 0= over h# ff = or if ( #exts ) + drop true exit ( -- true ) + then ( #exts ) + + \ Otherwise make the buffer larger to accomodate the extensions ... + 1+ /edid-chunk * to /edid ( ) + edid /edid resize-memory if ( adr' ) + drop ( ) + 0 to /edid 0 to edid ( ) + false exit ( ) + then ( adr ) + to edid ( ) + + \ ... and read the extensions + edid /edid /edid-chunk /string /edid-chunk ( adr len offset ) + " i2c-read" ['] $call-parent catch if ( x x x x x ) + 2drop 3drop ( ) + release-edid false exit ( -- false ) + then + + true ; - : edid$ ( -- adr len ) hdmi-edid h# 100 ; + : edid$ ( -- adr len ) edid /edid ; finish-device finish-device [then] device-end + +devalias i2c6 /hdmi-i2c

1 0

[commit] r3467 - cpu/arm/olpc/4.0 dev
by repository service Dec. 3, 2012

Dec. 3, 2012

Author: wmb Date: Mon Dec 3 08:05:56 2012 New Revision: 3467 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3467 Log: OLPC XO-4 - Added parser/displayer for HDMI EDID info. Added: dev/edid.fth Modified: cpu/arm/olpc/4.0/fw.bth Modified: cpu/arm/olpc/4.0/fw.bth ============================================================================== --- cpu/arm/olpc/4.0/fw.bth Wed Nov 28 17:56:41 2012 (r3466) +++ cpu/arm/olpc/4.0/fw.bth Mon Dec 3 08:05:56 2012 (r3467) @@ -25,5 +25,6 @@ fload ${BP}/cpu/arm/olpc/cl4/testinstructions.fth fload ${BP}/cpu/arm/olpc/gpio-gamekeys.fth fload ${BP}/cpu/arm/olpc/test-tweaks.fth +fload ${BP}/dev/edid.fth fload ${BP}/cpu/arm/olpc/save-fw.fth Added: dev/edid.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ dev/edid.fth Mon Dec 3 08:05:56 2012 (r3467) @@ -0,0 +1,392 @@ +\ See license at end of file +purpose: Parse and display EDID information + +\ Detailed timing descriptors +0 value the-dtd + +: dtd@ ( offset -- n ) the-dtd + c@ ; +: dtd-pixclk ( -- pix/10kHz ) 0 dtd@ 1 dtd@ bwjoin ; +: dtd-hactive ( -- pix ) 2 dtd@ 4 dtd@ 4 rshift bwjoin ; +: dtd-hblank ( -- pix ) 3 dtd@ 4 dtd@ h# f and bwjoin ; +: dtd-vactive ( -- pix ) 5 dtd@ 7 dtd@ 4 rshift bwjoin ; +: dtd-vblank ( -- pix ) 6 dtd@ 7 dtd@ h# f and bwjoin ; +: dtd-hsoffs ( -- pix ) 8 dtd@ d# 11 dtd@ 6 rshift 3 and bwjoin ; +: dtd-hswidth ( -- pix ) 9 dtd@ d# 11 dtd@ 4 rshift 3 and bwjoin ; +: dtd-vsoffs ( -- pix ) d# 10 dtd@ 4 rshift d# 11 dtd@ 6 rshift 3 and bwjoin ; +: dtd-vswidth ( -- pix ) d# 10 dtd@ h# f and d# 11 dtd@ 4 rshift 3 and bwjoin ; +: dtd-hdisplay ( -- mm ) d# 12 dtd@ d# 14 dtd@ 4 rshift bwjoin ; +: dtd-vdisplay ( -- mm ) d# 13 dtd@ d# 14 dtd@ h# f and bwjoin ; +: dtd-hborder ( -- pix ) d# 15 dtd@ ; +: dtd-vborder ( -- pix ) d# 16 dtd@ ; +: dtd-features ( -- bits ) d# 17 dtd@ ; + +: .dd ( n -- ) push-decimal (.) type pop-base ; +: .+- ( n -- ) if ." +" else ." -" then ; +: .dtd ( adr -- ) + to the-dtd + dtd-pixclk ( pixclk/10khz ) + push-decimal + <# u# u# [char] . hold u#s u#> type ." MHz " + dtd-hactive .dd ." x" dtd-vactive .dd space + \ ." " dtd-hdisplay .dd ." x" dtd-vdisplay .dd ." mm " + ." Blank: " dtd-hblank .dd ." ," dtd-vblank .dd + ." Sync: " + dtd-features 2 and .+- + dtd-hswidth .dd ." @" dtd-hsoffs .dd + ." ," + dtd-features 4 and .+- + dtd-vswidth .dd ." @" dtd-vsoffs .dd + ." Border: " dtd-hborder .dd ." ," dtd-vborder .dd cr + pop-base +; + +string-array timing-names + ," 800x600@60" + ," 800x600@56" + ," 640x480@75" + ," 640x480@72" + ," 640x480@67" + ," 640x480@60" + ," 720x400@88" + ," 720x400@70" + ," 1280x1024@75" + ," 1024x768@75" + ," 1024x768@72" + ," 1024x768@60" + ," 1024x768@87" + ," 832x624@75" + ," 800x600@75" + ," 800x600@72" + ," ?x?@?" + ," ?x?@?" + ," ?x?@?" + ," ?x?@?" + ," ?x?@?" + ," ?x?@?" + ," ?x?@?" + ," 1152x870@75" +end-string-array + +0 value the-edid +: edid@ ( offset -- byte ) the-edid + c@ ; + +: .yres ( xres 2nd -- ) + 6 rshift case + 0 of d# 16 d# 10 endof + 1 of d# 4 d# 3 endof + 2 of d# 5 d# 4 endof + 3 of d# 16 d# 9 endof + endcase + swap */ .dd +; +: .std ( xrescoded 2nd -- ) + over 1 = if 2drop exit then ( xrescoded 2nd ) + swap d# 31 + 8 * dup .dd ." x" ( 2nd xres ) + over .yres ." @" ( 2nd ) + h# 3f and d# 60 + .dd space ( ) +; + +: .timings ( -- ) + ." VESA timings:" cr + d# 35 edid@ d# 36 edid@ d# 37 edid@ 0 bljoin ( n ) + d# 24 0 do + dup 1 i lshift and if i timing-names count type space then + loop drop + d# 54 d# 38 do + i edid@ i 1+ edid@ .std + 2 +loop + cr +; +: .more-std ( offset -- ) + 5 + d# 12 bounds do + i edid@ i 1+ edid@ .std + 2 +loop +; +: .edid-text ( offset -- ) + 5 + d# 13 bounds do + i edid@ dup h# a = if drop cr unloop exit then + emit + loop + cr +; +: .other ( offset -- ) + dup 3 + edid@ case ( offset ) + h# fa of dup .more-std endof + h# fb of ( white point data ) endof + h# fc of dup ." Name: " .edid-text endof + h# fd of ( monitor range limits ) endof + h# fe of dup ." Text: " .edid-text endof + h# ff of dup ." Serial#: " .edid-text endof + endcase + drop +; +: .dtds ( -- ) + ." Detailed timings:" cr + d# 126 d# 54 do + i edid@ if + i the-edid + .dtd + else + i .other + then + d# 18 +loop +; + + +\ CEA-861 Extension +0 value the-cea +: cea@ ( offset -- byte ) the-cea + c@ ; + +: ?.+ ( n -- n ) dup if ." +" then ; +: peel-bit ( n -- n' flag ) dup u2/ swap 1 and 0<> ; + +\ Audio sample rates +: .cea-freqs ( n -- ) + peel-bit if ." 32" then ?.+ + peel-bit if ." 44" then ?.+ + peel-bit if ." 48" then ?.+ + peel-bit if ." 88" then ?.+ + peel-bit if ." 96" then ?.+ + peel-bit if ." 176" then ?.+ + peel-bit if ." 192" then drop + ." kHz" +; +\ Audio sample widths +: .cea-bits ( n -- ) + peel-bit if ." 16" then ?.+ + peel-bit if ." 20" then ?.+ + peel-bit if ." 24" then drop + ." bits" +; + +string-array format-names +( 0 ) ," " +( 1 ) ," LPCM" +( 2 ) ," AC-3" +( 3 ) ," MPEG1" +( 4 ) ," Moffset size 3" +( 5 ) ," MPEG2" +( 6 ) ," AAC" +( 7 ) ," DTS" +( 8 ) ," ATRAC" +( 9 ) ," SACD" +( 10 ) ," DD+" +( 11 ) ," DTS-HD" +( 12 ) ," TrueHD" +( 13 ) ," DST" +( 14 ) ," WMA" +end-string-array + +: .cea-audio ( offset size -- ) + ." Audio: " + bounds ?do + i cea@ format-names count type ." ," + i 1+ cea@ .cea-freqs ." @" + i 2+ cea@ .cea-bits space + 3 +loop + cr +; + +\ CEA-861 short names for display modes +string-array short-names + ( 0 ) ," ?" + ( 1 ) ," DMT0659" \ 4:3 640x480p @ 59.94/60Hz + ( 2 ) ," 480p" \ 4:3 720x480p @ 59.94/60Hz + ( 3 ) ," 480pH" \ 16:9 720x480p @ 59.94/60Hz + ( 4 ) ," 720p" \ 16:9 1280x720p @ 59.94/60Hz + ( 5 ) ," 1080i" \ 16:9 1920x1080i @ 59.94/60Hz + ( 6 ) ," 480i" \ 4:3 720(1440)x480i @ 59.94/60Hz + ( 7 ) ," 480iH" \ 16:9 720(1440)x480i @ 59.94/60Hz + ( 8 ) ," 240p" \ 4:3 720(1440)x240p @ 59.94/60Hz + ( 9 ) ," 240pH" \ 16:9 720(1440)x240p @ 59.94/60Hz + ( 10 ) ," 480i4x" \ 4:3 (2880)x480i @ 59.94/60Hz + ( 11 ) ," 480i4xH" \ 16:9 (2880)x480i @ 59.94/60Hz + ( 12 ) ," 240p4x" \ 4:3 (2880)x240p @ 59.94/60Hz + ( 13 ) ," 240p4xH" \ 16:9 (2880)x240p @ 59.94/60Hz + ( 14 ) ," 480p2x" \ 4:3 1440x480p @ 59.94/60Hz + ( 15 ) ," 480p2xH" \ 16:9 1440x480p @ 59.94/60Hz + ( 16 ) ," 1080p" \ 16:9 1920x1080p @ 59.94/60Hz + ( 17 ) ," 576p" \ 4:3 720x576p @ 50Hz + ( 18 ) ," 576pH" \ 16:9 720x576p @ 50Hz + ( 19 ) ," 720p50" \ 16:9 1280x720p @ 50Hz + ( 20 ) ," 1080i25" \ 16:9 1920x1080i @ 50Hz* + ( 21 ) ," 576i" \ 4:3 720(1440)x576i @ 50Hz + ( 22 ) ," 576iH" \ 16:9 720(1440)x576i @ 50Hz + ( 23 ) ," 288p" \ 4:3 720(1440)x288p @ 50Hz + ( 24 ) ," 288pH" \ 16:9 720(1440)x288p @ 50Hz + ( 25 ) ," 576i4x" \ 4:3 (2880)x576i @ 50Hz + ( 26 ) ," 576i4xH" \ 16:9 (2880)x576i @ 50Hz + ( 27 ) ," 288p4x" \ 4:3 (2880)x288p @ 50Hz + ( 28 ) ," 288p4xH" \ 16:9 (2880)x288p @ 50Hz + ( 29 ) ," 576p2x" \ 4:3 1440x576p @ 50Hz + ( 30 ) ," 576p2xH" \ 16:9 1440x576p @ 50Hz + ( 31 ) ," 1080p50" \ 16:9 1920x1080p @ 50Hz + ( 32 ) ," 1080p24" \ 16:9 1920x1080p @ 23.98/24Hz + ( 33 ) ," 1080p25" \ 16:9 1920x1080p @ 25Hz + ( 34 ) ," 1080p30" \ 16:9 1920x1080p @ 29.97/30Hz + ( 35 ) ," 480p4x" \ 4:3 (2880)x480p @ 59.94/60Hz + ( 36 ) ," 480p4xH" \ 16:9 (2880)x480p @ 59.94/60Hz + ( 37 ) ," 576p4x" \ 4:3 (2880)x576p @ 50Hz + ( 38 ) ," 576p4xH" \ 16:9 (2880)x576p @ 50Hz + ( 39 ) ," 1080i25" \ 16:9 1080i(1250 Total) @ 50Hz* + ( 40 ) ," 1080i50" \ 16:9 1920x1080i @ 100Hz + ( 41 ) ," 720p100" \ 16:9 1280x720p @ 100Hz + ( 42 ) ," 576p100" \ 4:3 720x576p @ 100Hz + ( 43 ) ," 576p100H" \ 16:9 720x576p @ 100Hz + ( 44 ) ," 576i50" \ 4:3 720(1440)x576i @ 100Hz + ( 45 ) ," 576i50H" \ 16:9 720(1440)x576i @ 100Hz + ( 46 ) ," 1080i60" \ 16:9 1920x1080i @ 119.88/120Hz + ( 47 ) ," 720p120" \ 16:9 1280x720p @ 119.88/120Hz + ( 48 ) ," 480p119" \ 4:3 720x480p @ 119.88/120Hz + ( 49 ) ," 480p119H" \ 16:9 720x480p @ 119.88/120Hz + ( 50 ) ," 480i59" \ 4:3 720(1440)x480i @ 119.88/120Hz + ( 51 ) ," 480i59H" \ 16:9 720(1440)x480i @ 119.88/120Hz + ( 52 ) ," 576p200" \ 4:3 720x576p @ 200Hz + ( 53 ) ," 576p200H" \ 16:9 720x576p @ 200Hz + ( 54 ) ," 576i100" \ 4:3 720(1440)x576i @ 200Hz + ( 55 ) ," 576i100H" \ 16:9 720(1440)x576i @ 200Hz + ( 56 ) ," 480p239" \ 4:3 720x480p @ 239.76/240Hz + ( 57 ) ," 480p239H" \ 16:9 720x480p @ 239.76/240Hz + ( 58 ) ," 480i119" \ 4:3 720(1440)x480i @ 239.76/240Hz + ( 59 ) ," 480i119H" \ 16:9 720(1440)x480i @ 239.76/240Hz + ( 60 ) ," 720p24" \ 16:9 1280x720p @ 23.98/24Hz + ( 61 ) ," 720p25" \ 16:9 1280x720p @ 25Hz + ( 62 ) ," 720p30" \ 16:9 1280x720p @ 29.97/30Hz + ( 63 ) ," 1080p120" \ 16:9 1920x1080p @ 119.88/120Hz +end-string-array + +false value 1080p-native? +: .cea-video ( offset size -- ) + false to 1080p-native? + ." CEA/HDMI Modes: " + bounds ?do + i cea@ ( code ) + dup h# 80 and if ( code ) + ." *" h# 7f and ( index ) + dup d# 16 = if true to 1080p-native? then + then ( index ) + short-names count type space ( ) + loop + cr +; + +: .2x ( n -- ) push-hex <# u# u# u#> type pop-base ; +: .cea-vendor ( offset size -- ) + ." Vendor: " + over 2 + cea@ .2x ." :" over 1 + cea@ .2x ." :" over cea@ .2x ( offset size ) + ." SPA " over 3 + cea@ .2x ." ." over 4 + cea@ .2x ( offset size ) + 5 /string bounds ?do i cea@ .2x space loop ( ) + cr +; + +\ Speaker configurations. Long ago, in a galaxy far away, one +\ good speaker was considered good enough. Then marketing +\ invented stereo so they could sell more speakers, and the +\ rest is history. +: .cea-speaker ( offset size -- ) + drop cea@ + peel-bit if " Front_L+R " then \ Stereo + peel-bit if " LFE " then \ Subwoofer makes 2.1 + peel-bit if " Front_Center " then \ Center fill makes 3.1 + peel-bit if " Rear_L+R " then \ Ambience makes 5.1 + peel-bit if " Rear_Center " then \ 7.1 ... + peel-bit if " Front_Center_L+R " then \ How many speakers do they want to sell you? + peel-bit if " Rear_Center_L+R " then \ How can you live without twelve speakers? + drop +; + +: .data-block ( offset -- advance ) + dup 1+ swap cea@ ( offset' tag ) + dup h# 1f and swap ( offset size tag ) + 5 rshift case ( offset size ) + 1 of 2dup .cea-audio endof ( offset size ) + 2 of 2dup .cea-video endof ( offset size ) + 3 of 2dup .cea-vendor endof ( offset size ) + 4 of 2dup .cea-speaker endof ( offset size ) + endcase ( offset size ) + nip 1+ ( advance ) +; +: .cea-data ( -- ) + 2 cea@ 4 ?do + i .data-block ( advance ) + +loop +; +: .cea-dtds ( -- ) + ." CEA Detailed Timings:" cr + 2 cea@ the-cea + ( adr ) + begin dup w@ while ( adr ) + dup .dtd ( adr ) + d# 18 + ( adr' ) + repeat ( adr ) + drop ( ) +; + +: .cea-ext ( adr -- ) + to the-cea + 1 cea@ 3 <> if + ." CEA version " 1 cea@ .d ." not supported" cr + exit + then + .cea-data + .cea-dtds +; +: .edid-extension ( adr -- ) + dup c@ case + 2 of dup .cea-ext endof + \ Ignoring other extensions for now + endcase + drop +; +: .extensions ( -- ) + d# 126 edid@ 0 ?do + the-edid i 1+ h# 80 * + .edid-extension + loop +; +: dump-edid ( adr len -- ) + drop to the-edid + the-edid " "(00ffffffffffff00)" comp if + ." Not an EDID" cr + exit + then + d# 21 edid@ .dd ." x" d# 22 edid@ .dd ." cm " cr + .timings + .dtds + .extensions +; +: .hdmi ( -- ) + " hdmi-present?" $call-screen 0= if + ." Connect an HDMI monitor ..." + begin " hdmi-present?" $call-screen until + cr + then + " /hdmi-ddc" open-dev dup if ( ih ) + " edid$" 2 pick $call-method ( ih adr len ) + rot close-dev ( adr len ) + dump-edid + then + ." Turning on monitor at " + 1080p-native? if ." 1080p" 1080p else ." 720p" 720p then cr +; + +\ LICENSE_BEGIN +\ Copyright (c) 2012 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