July 2011 - openfirmware - mail.coreboot.org

[commit] r2376 - cpu/arm/olpc/1.75
by repository service July 16, 2011

July 16, 2011

Author: wmb Date: Sat Jul 16 13:47:45 2011 New Revision: 2376 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2376 Log: OLPC XO-1.75 - Removed the redundant copy of boardgpio file in the OFW tree - the one in the cforth tree prevails. Deleted: cpu/arm/olpc/1.75/boardgpio.fth

1 0

[commit] r2375 - cpu/arm/olpc/1.75
by repository service July 16, 2011

July 16, 2011

Author: wmb Date: Sat Jul 16 13:45:37 2011 New Revision: 2375 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2375 Log: OLPC XO-1.75 - Synchronized the boardgpio file in the OFW tree with the master one in the cforth tree. Modified: cpu/arm/olpc/1.75/boardgpio.fth Modified: cpu/arm/olpc/1.75/boardgpio.fth ============================================================================== --- cpu/arm/olpc/1.75/boardgpio.fth Sat Jul 16 13:40:24 2011 (r2374) +++ cpu/arm/olpc/1.75/boardgpio.fth Sat Jul 16 13:45:37 2011 (r2375) @@ -18,45 +18,36 @@ d# 58 gpio-dir-out \ WLAN_RESET# d# 73 gpio-dir-out \ CAM_RST + d# 125 gpio-set \ EC_SPI_ACK + d# 125 gpio-dir-out \ EC_SPI_ACK + d# 146 gpio-dir-out \ HUB_RESET# + d# 148 gpio-clr \ SOC_EN_KBD_PWR# + d# 148 gpio-dir-out \ SOC_EN_KBD_PWR# + d# 155 gpio-clr + d# 155 gpio-dir-out \ EC_SPI_CMD [ifdef] cl2-a1 d# 97 gpio-dir-out \ RTC_SCK d# 98 gpio-dir-out \ RTC_SDA -[else] - d# 53 gpio-set \ RTC_SCK - d# 53 gpio-dir-out \ RTC_SCK - d# 103 gpio-dir-out \ EC_EDI_DO - d# 104 gpio-set \ EC_EDI_CS# - d# 104 gpio-dir-out \ EC_EDI_CS# - d# 106 gpio-dir-out \ EC_EDI_CLK - d# 143 gpio-clr - d# 143 gpio-dir-out \ MIC_AC#/DC - d# 149 gpio-clr \ eMMC_RST# - d# 149 gpio-dir-out \ eMMC_RST# -[then] - - d# 125 gpio-set \ EC_SPI_ACK - d# 125 gpio-dir-out \ EC_SPI_ACK -[ifdef] cl2-a1 - d# 145 gpio-dir-out \ EN_CAM_PWR -[else] - d# 150 gpio-clr \ EN_CAM_PWR - d# 150 gpio-dir-out \ EN_CAM_PWR -[then] - d# 146 gpio-dir-out \ HUB_RESET# -[ifdef] cl2-a1 - d# 151 gpio-dir-out \ DCONLOAD -[else] - d# 142 gpio-dir-out \ DCONLOAD -[then] - d# 155 gpio-clr - d# 155 gpio-dir-out \ EC_SPI_CMD - -[ifdef] cl2-a1 - d# 162 gpio-dir-out \ DCON_SCL - d# 163 gpio-dir-out \ DCON_SDA -[else] - d# 161 gpio-dir-out \ DCON_SCL - d# 110 gpio-dir-out \ DCON_SDA + d# 145 gpio-dir-out \ EN_CAM_PWR + d# 151 gpio-dir-out \ DCONLOAD + d# 162 gpio-dir-out \ DCON_SCL + d# 163 gpio-dir-out \ DCON_SDA +[else] + d# 53 gpio-set \ RTC_SCK + d# 53 gpio-dir-out \ RTC_SCK + d# 104 gpio-set \ EC_EDI_CS# + d# 104 gpio-dir-out \ EC_EDI_CS# + d# 105 gpio-dir-out \ EC_EDI_MOSI + d# 106 gpio-dir-out \ EC_EDI_CLK + d# 110 gpio-dir-out \ DCON_SDA + d# 142 gpio-dir-out \ DCONLOAD + d# 143 gpio-clr \ MIC_AC#/DC + d# 143 gpio-dir-out \ MIC_AC#/DC + d# 149 gpio-clr \ eMMC_RST# + d# 149 gpio-dir-out \ eMMC_RST# + d# 150 gpio-clr \ EN_CAM_PWR + d# 150 gpio-dir-out \ EN_CAM_PWR + d# 161 gpio-dir-out \ DCON_SCL [then] ; @@ -120,20 +111,20 @@ 3 af, \ GPIO_44 - SPI_MOSI 3 af, \ GPIO_45 - SPI_CLK 3 af, \ GPIO_46 - SPI_FRM - 3 af, \ GPIO_47 - G_SENSOR_SDL (TWSI6) - 3 af, \ GPIO_48 - G_SENSOR_SDA + 3 pull-up, \ GPIO_47 - G_SENSOR_SDL (TWSI6) + 3 pull-up, \ GPIO_48 - G_SENSOR_SDA no-update, \ GPIO_49 - Not connected (TP62) no-update, \ GPIO_50 - Not connected (TP114) no-update, \ GPIO_51 - Not connected (TP59) no-update, \ GPIO_52 - Not connected (TP113) -\ 2 af, \ GPIO_53 - RTC_SCK (TWSI2) if R124 populated -\ 2 af, \ GPIO_54 - RTC_SDA (TWSI2) if R125 populated [ifdef] cl2-a1 no-update, \ GPIO_53 - Not connected if nopop R124 to use TWSI6 for RTC no-update, \ GPIO_54 - Not connected if nopop R125 to use TWSI6 for RTC [else] - 0 af, \ GPIO_53 - RTC_SCK - 0 af, \ GPIO_54 - RTC_SDA + 2 af, \ GPIO_53 - RTC_SCK (TWSI2) if R124 populated + 2 af, \ GPIO_54 - RTC_SDA (TWSI2) if R125 populated +\ 0 af, \ GPIO_53 - RTC_SCK +\ 0 af, \ GPIO_54 - RTC_SDA [then] no-update, \ GPIO_55 - Not connected (TP51) [ifdef] cl2-a1 @@ -157,8 +148,8 @@ 1 af, \ GPIO_69 - PIXMCLK 1 af, \ GPIO_70 - PIXCLK - 1 af, \ GPIO_71 - EC_SCL (TWSI3) - 1 af, \ GPIO_72 - EC_SDA + 0 af, \ GPIO_71 - SOC_KBD_CLK \ Was EC_SCL (TWSI3) + 0 af, \ GPIO_72 - SOC_KBD_DAT \ Was EC_SDA 0 af, \ GPIO_73 - CAM_RST (use as GPIO out) 1 af, \ GPIO_74 - GFVSYNC @@ -193,7 +184,7 @@ 0 af, \ GPIO_97 - RTC_SCK (bitbang) if R100 populated 0 af, \ GPIO_98 - RTC_SDA (bitbang) if R106 populated [else] - 0 af, \ GPIO_96 - EXT_MIC_PLUG + 0 pull-up, \ GPIO_96 - EXT_MIC_PLUG 0 af, \ GPIO_97 - HP_PLUG no-update, \ GPIO_98 - Not connected [then] @@ -214,7 +205,7 @@ 1 af, \ GPIO_105 - EC_EDI_DI 1 af, \ GPIO_106 - EC_EDI_CLK [then] - 0 af, \ GPIO_107 - ND_IO[4] + 1 af, \ GPIO_107 - (ND_IO[4]) - SOC_TPD_DAT 1 af, \ GPIO_108 - CAM_SDL - Use as GPIO, bitbang 1 af, \ GPIO_109 - CAM_SDA - Use as GPIO, bitbang @@ -225,10 +216,10 @@ 0 af, \ GPIO_112 - ND_RDY[0] [else] 1 pull-up, \ GPIO_110 - DCON_SDA - 2 af, \ GPIO_111 - eMMC_D0 - 2 af, \ GPIO_112 - eMMC_CMD + 2 +fast af, \ GPIO_111 - eMMC_D0 + 2 +fast af, \ GPIO_112 - eMMC_CMD [then] - 3 af, \ GPIO_113 - (SM_RDY) - MSD_CMD aka SD1_CMD (externally pulled up) + 3 +fast af, \ GPIO_113 - (SM_RDY) - MSD_CMD aka SD1_CMD (externally pulled up) 1 af, \ GPIO_114 - G_CLK_OUT - Not connected (TP93) 4 af, \ GPIO_115 - UART3_TXD (J4) @@ -246,21 +237,21 @@ \ 0 af, \ GPIO_125 - EC_SPI_ACK 0 pull-up, \ GPIO_125 - EC_SPI_ACK - 3 pull-up, \ GPIO_126 - MSD_DATA2 AKA SD1_DATA2 - 3 pull-up, \ GPIO_127 - MSD_DATA0 AKA SD1_DATA0 + 3 +fast af, \ GPIO_126 - MSD_DATA2 AKA SD1_DATA2 + 3 +fast af, \ GPIO_127 - MSD_DATA0 AKA SD1_DATA0 0 af, \ GPIO_128 - EB_MODE# 0 af, \ GPIO_129 - LID_SW# - 3 pull-up, \ GPIO_130 - MSD_DATA3 AKA SD1_DATA3 - 1 +fast pull-up, \ GPIO_131 - SD_DATA3 AKA SD2_DATA3 - 1 +fast pull-up, \ GPIO_132 - SD_DATA2 AKA SD2_DATA2 - 1 +fast pull-up, \ GPIO_133 - SD_DATA1 AKA SD2_DATA1 - 1 +fast pull-up, \ GPIO_134 - SD_DATA0 AKA SD2_DATA0 - 3 pull-up, \ GPIO_135 - MSD_DATA1 AKA SD1_DATA1 -\ 1 +fast pull-up, \ GPIO_136 - SD_CMD AKA SD2_CMD - 1 +fast af, \ GPIO_136 - SD_CMD AKA SD2_DATA - CMD is pulled up externally + 3 +fast af, \ GPIO_130 - MSD_DATA3 AKA SD1_DATA3 + 1 +fast af, \ GPIO_131 - SD_DATA3 AKA SD2_DATA3 + 1 +fast af, \ GPIO_132 - SD_DATA2 AKA SD2_DATA2 + 1 +fast af, \ GPIO_133 - SD_DATA1 AKA SD2_DATA1 + 1 +fast af, \ GPIO_134 - SD_DATA0 AKA SD2_DATA0 + 3 +fast af, \ GPIO_135 - MSD_DATA1 AKA SD1_DATA1 +\ 1 +fast pull-up, \ GPIO_136 - SD_CMD AKA SD2_CMD + 1 +fast af, \ GPIO_136 - SD_CMD AKA SD2_CMD - CMD is pulled up externally no-update, \ GPIO_137 - Not connected (TP111) - 3 pull-up, \ GPIO_138 - MSD_CLK AKA SD1_CLK - 1 +fast pull-up, \ GPIO_139 - SD_CLK AKA SD2_CLK + 3 +fast af, \ GPIO_138 - MSD_CLK AKA SD1_CLK + 1 +fast af, \ GPIO_139 - SD_CLK AKA SD2_CLK no-update, \ GPIO_140 - Not connected if R130 is nopop \ 1 af, \ GPIO_140 - (SD_CD# if R130 is populated) 1 af, \ GPIO_141 - SD_WP# AKA SD2_WP# @@ -281,7 +272,7 @@ 1 af, \ GPIO_146 - HUB_RESET# 0 af, \ GPIO_147 - ND_WE_N - 0 af, \ GPIO_148 - ND_RE_N + 1 af, \ GPIO_148 - ND_RE_N - SOC_EN_KBD_PWR# [ifdef] cl2-a1 0 af, \ GPIO_149 - ND_CLE 0 af, \ GPIO_150 - ND_ALE @@ -289,7 +280,7 @@ [else] 1 af, \ GPIO_149 - eMMC_RST# 1 af, \ GPIO_150 - EN_CAM_PWR - 2 af, \ GPIO_151 - eMMC_CLK + 2 +fast af, \ GPIO_151 - eMMC_CLK [then] 1 af, \ GPIO_152 - (SM_BELn) - Not connected (TP40) 1 af, \ GPIO_153 - (SM_BEHn) - Not connected (TP105) @@ -299,7 +290,7 @@ no-update, \ GPIO_157 - PRI_TDS (JTAG) no-update, \ GPIO_158 - PRI_TDK (JTAG) no-update, \ GPIO_159 - PRI_TDO (JTAG) - 0 af, \ GPIO_160 - ND_RDY[1] + 1 af, \ GPIO_160 - (ND_RDY[1]) - SOC_TPD_CLK [ifdef] cl2-a1 1 af, \ GPIO_161 - ND_IO[12] - Not connected (TP 44) 1 af, \ GPIO_162 - (ND_IO[11]) - DCON_SCL @@ -311,13 +302,13 @@ 0 af, \ GPIO_168 - ND_IO[0] [else] 1 af, \ GPIO_161 - DCON_SCL - 2 af, \ GPIO_162 - eMMC_D6 - 2 af, \ GPIO_163 - eMMC_D4 - 2 af, \ GPIO_164 - eMMC_D2 - 2 af, \ GPIO_165 - eMMC_D7 - 2 af, \ GPIO_166 - eMMC_D5 - 2 af, \ GPIO_167 - eMMC_D3 - 2 af, \ GPIO_168 - eMMC_D1 + 2 +fast af, \ GPIO_162 - eMMC_D6 + 2 +fast af, \ GPIO_163 - eMMC_D4 + 2 +fast af, \ GPIO_164 - eMMC_D2 + 2 +fast af, \ GPIO_165 - eMMC_D7 + 2 +fast af, \ GPIO_166 - eMMC_D5 + 2 +fast af, \ GPIO_167 - eMMC_D3 + 2 +fast af, \ GPIO_168 - eMMC_D1 [then] : init-mfprs

1 0

[commit] r2374 - cpu/arm/olpc/1.75 cpu/x86/pc/olpc dev/via/unichrome
by repository service July 16, 2011

July 16, 2011

Author: wmb Date: Sat Jul 16 13:40:24 2011 New Revision: 2374 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2374 Log: OLPC XO-1.75 (and 1.5) - Fixed the vector test instructions display to use the right colors when the display is in RGB565 mode, and modified the XO-1.5 and XO-1.75 drivers to support the necessary color conversion function. Modified: cpu/arm/olpc/1.75/devices.fth cpu/x86/pc/olpc/strokes.fth dev/via/unichrome/loadpkg.fth dev/via/unichrome/unichrome.fth Modified: cpu/arm/olpc/1.75/devices.fth ============================================================================== --- cpu/arm/olpc/1.75/devices.fth Sat Jul 16 13:37:09 2011 (r2373) +++ cpu/arm/olpc/1.75/devices.fth Sat Jul 16 13:40:24 2011 (r2374) @@ -194,9 +194,16 @@ fload ${BP}/cpu/arm/olpc/1.75/lcd.fth fload ${BP}/dev/olpc/dcon/mmp2dcon.fth \ DCON control + defer convert-color ' noop to convert-color defer pixel* defer pixel+ defer pixel! + + : color! ( r g b index -- ) 4drop ; + : color@ ( index -- r g b ) drop 0 0 0 ; + + fload ${BP}/dev/video/common/rectangle16.fth \ Rectangular graphics + depth d# 24 = [if] code 3a+ ( adr n -- n' ) pop r0,sp @@ -215,17 +222,14 @@ ' 3* to pixel* ' 3a+ to pixel+ ' rgb888! to pixel! + ' noop to convert-color [else] ' /w* to pixel* ' wa+ to pixel+ ' w! to pixel! + ' argb>565-pixel to convert-color [then] - : color! ( r g b index -- ) 4drop ; - : color@ ( index -- r g b ) drop 0 0 0 ; - - fload ${BP}/dev/video/common/rectangle16.fth \ Rectangular graphics - : display-on \ init-xo-display \ Turns on DCON smb-init Modified: cpu/x86/pc/olpc/strokes.fth ============================================================================== --- cpu/x86/pc/olpc/strokes.fth Sat Jul 16 13:37:09 2011 (r2373) +++ cpu/x86/pc/olpc/strokes.fth Sat Jul 16 13:40:24 2011 (r2374) @@ -209,8 +209,8 @@ ; : circleat ( x y radius -- ) >r moveto r> rcircle ; -: set-fg ( fg -- ) to fg ; -: set-bg ( bg -- ) to bg ; +: set-fg ( fg -- ) convert-color to fg ; +: set-bg ( bg -- ) convert-color to bg ; dend Modified: dev/via/unichrome/loadpkg.fth ============================================================================== --- dev/via/unichrome/loadpkg.fth Sat Jul 16 13:37:09 2011 (r2373) +++ dev/via/unichrome/loadpkg.fth Sat Jul 16 13:40:24 2011 (r2374) @@ -19,12 +19,18 @@ defer pixel* ' noop is pixel* defer pixel+ ' + is pixel+ defer pixel! ' c! is pixel! +defer convert-color ' noop is convert-color +d# 1280 value width \ Frame buffer line width +d# 1024 value height \ Screen height +d# 16 value depth \ Bits per pixel +d# 1024 value /scanline \ Frame buffer line width + +fload ${BP}/dev/video/common/rectangle16.fth \ Rectangular graphics fload ${BP}/dev/video/controlr/vga.fth \ Standard VGA interfaces fload ${BP}/dev/via/unichrome/unichrome.fth \ Controller code fload ${BP}/dev/via/unichrome/accel2d.fth \ Accelerator fload ${BP}/dev/via/unichrome/vgamodes.fth \ Text mode support -fload ${BP}/dev/video/common/rectangle16.fth \ Rectangular graphics fload ${BP}/cpu/x86/pc/olpc/expand16.fth \ Expand image by 2x \ LICENSE_BEGIN Modified: dev/via/unichrome/unichrome.fth ============================================================================== --- dev/via/unichrome/unichrome.fth Sat Jul 16 13:37:09 2011 (r2373) +++ dev/via/unichrome/unichrome.fth Sat Jul 16 13:40:24 2011 (r2374) @@ -11,11 +11,6 @@ 0 value fb-va 0 value mmio-base -d# 1280 value width \ Frame buffer line width -d# 1024 value height \ Screen height -d# 16 value depth \ Bits per pixel -d# 1024 value /scanline \ Frame buffer line width - \ This writes a memory variable that the early startup code can find, \ so the resume-from-S3 path can do the right thing : note-mode ( mode# -- ) video-mode-adr ! ; @@ -273,12 +268,13 @@ \ at the end of each scanline. Adjust /scanline for others. set-pitch depth case - d# 16 of ['] w! ['] /w* ['] wa+ endof - d# 24 of ['] l! ['] /l* ['] la+ endof - d# 32 of ['] l! ['] /l* ['] la+ endof - ( default ) >r ['] c! ['] noop ['] + r> + d# 16 of ['] w! ['] /w* ['] wa+ ['] argb>565-pixel endof + d# 24 of ['] l! ['] /l* ['] la+ ['] noop endof + d# 32 of ['] l! ['] /l* ['] la+ ['] noop endof + ( default ) + >r ['] c! ['] noop ['] ca+ ['] noop r> endcase - to pixel+ to pixel* to pixel! + to convert-color to pixel+ to pixel* to pixel! ; : set-resolution ( width height depth -- ) set-depth to height to width ;

1 0

[commit] r2373 - cpu/arm/olpc/1.75 dev/olpc/touchpad ofw/gui
by repository service July 16, 2011

July 16, 2011

Author: wmb Date: Sat Jul 16 13:37:09 2011 New Revision: 2373 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2373 Log: Implemented hardware mouse cursor for XO-1.75 display driver and modified menu cursor tracking and synaptics touchpad diag to use it if present. Modified: cpu/arm/olpc/1.75/fw.bth cpu/arm/olpc/1.75/lcd.fth dev/olpc/touchpad/syntpad.fth ofw/gui/mouse.fth Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Fri Jul 15 15:18:51 2011 (r2372) +++ cpu/arm/olpc/1.75/fw.bth Sat Jul 16 13:37:09 2011 (r2373) @@ -111,9 +111,6 @@ ; ' (.firmware) to .firmware -patch merge-rect-565 merge-rect merge-cursor \ Hack since we do all our user-level graphics in 565 -patch merge-rect-565 merge-rect merge-cursor \ Hack since we do all our user-level graphics in 565 - \ Uninstall the diag menu from the general user interface vector \ so exiting from emacs doesn't invoke the diag menu. ' quit to user-interface Modified: cpu/arm/olpc/1.75/lcd.fth ============================================================================== --- cpu/arm/olpc/1.75/lcd.fth Fri Jul 15 15:18:51 2011 (r2372) +++ cpu/arm/olpc/1.75/lcd.fth Sat Jul 16 13:37:09 2011 (r2373) @@ -100,3 +100,109 @@ video-on ; : stop-video ( -- ) video-off ; + +: bg! ( r g b -- ) h# 124 lcd! ; +: lcd-set ( mask offset -- ) tuck lcd@ or swap lcd! ; +: lcd-clr ( mask offset -- ) tuck lcd@ swap invert and swap lcd! ; + +: cursor-on ( -- ) h# 100.0000 h# 190 lcd-set ; +: cursor-off ( -- ) h# 100.0000 h# 190 lcd-clr ; + +: cursor-xy@ ( -- x y ) h# 10c lcd@ lwsplit ; +: cursor-xy! ( x y -- ) cursor-off wljoin h# 10c lcd! cursor-on ; + +: cursor-wh@ ( -- w h ) h# 110 lcd@ lwsplit ; +: cursor-wh! ( w h -- ) wljoin h# 110 lcd! ; + +: rgb<>bgr ( rgb -- bgr ) lbsplit drop swap rot 0 bljoin ; +: cursor-fgbg! ( fg-rgb bg-rgb -- ) rgb<>bgr h# 12c lcd! rgb<>bgr h# 128 lcd! ; +: cursor-fgbg@ ( -- fg-rgb bg-rgb ) h# 128 lcd@ rgb<>bgr h# 12c lcd@ rgb<>bgr ; + +: cursor-1bpp-mode ( -- ) h# 200.0000 h# 190 lcd-set ; +: cursor-2bpp-mode ( -- ) h# 200.0000 h# 190 lcd-clr ; +: cursor-opaque ( -- ) cursor-1bpp-mode h# 400.0000 h# 190 lcd-set ; +: cursor-transparent ( -- ) cursor-1bpp-mode h# 400.0000 h# 190 lcd-clr ; + +: sram-write-mode ( -- ) h# 198 lcd@ h# c000 invert and h# 8000 or h# 198 lcd! ; +: sram-read-mode ( -- ) h# 198 lcd@ h# c000 invert and h# 198 lcd! ; +: cursor-sram@ ( offset -- value ) h# 0c bwjoin h# 198 lcd! h# 158 lcd@ ; +: cursor-sram! ( value offset -- ) swap h# 19c lcd! h# 8c bwjoin h# 198 lcd! ; +: sram-read ( adr len start path -- ) + bwjoin -rot bounds ?do ( index ) + dup h# 198 lcd! h# 158 lcd@ i l! ( index ) + 1+ ( index' ) + /l +loop ( index ) + drop ( ) +; +: sram-write ( adr len start path -- ) + h# 80 or ( adr len start mode ) + bwjoin -rot bounds ?do ( index ) + i l@ h# 19c lcd! dup h# 198 lcd! ( index ) + 1+ ( index' ) + /l +loop ( index ) + drop ( ) +; +: cursor-sram-read ( adr len start -- ) h# c sram-read ; +: cursor-sram-write ( adr len start -- ) h# c sram-write ; + +0 value cursor-w +0 value cursor-h + +: enable-cursor-writes ( -- ) + h# 8000 h# 1a4 lcd-set \ allow writes to cursor SRAM +; + +0 value #cursor-bits +0 value cursor-bits +0 value cursor-index +: flush-cursor-bits ( -- ) + cursor-bits cursor-index cursor-sram! + 0 to #cursor-bits + 0 to cursor-bits + cursor-index 1+ to cursor-index +; +: +2bits ( 0..3 -- ) + #cursor-bits lshift cursor-bits or to cursor-bits + #cursor-bits 2+ to #cursor-bits + #cursor-bits d# 32 = if + flush-cursor-bits + then +; +: init-cursor-bits ( -- ) + 0 to #cursor-bits + 0 to cursor-bits + 0 to cursor-index +; +0 value cursor-pitch +: set-cursor-line ( fg-l bg-l -- ) + cursor-w 0 do ( fg-l bg-l ) + over h# 8000.0000 and if ( fg-l bg-l ) + 1 \ Color 1 ( fg-l bg-l value ) + else ( fg-l bg-l ) + dup h# 8000.0000 and if ( fg-l bg-l ) + 2 \ Color 2 ( fg-l bg-l value ) + else ( fg-l bg-l ) + 0 \ Transparent ( fg-l bg-l value ) + then ( fg-l bg-l value ) + then ( fg-l bg-l value ) + +2bits ( fg-l bg-l ) + swap 2* swap 2* ( fg-l' bg-l' ) + loop ( fg-l bg-l ) + 2drop ( ) +; +: set-cursor-image ( 'fg 'bg w h fg-color bg-color -- ) + init-cursor-bits ( 'fg 'bg w h fg-color bg-color ) + enable-cursor-writes ( 'fg 'bg w h fg-color bg-color ) + cursor-off ( 'fg 'bg w h fg-color bg-color ) + cursor-2bpp-mode ( 'fg 'bg w h fg-color bg-color ) + cursor-fgbg! ( 'fg 'bg w h ) + to cursor-h to cursor-w ( 'fg 'bg ) + cursor-w cursor-h cursor-wh! ( 'fg 'bg ) + cursor-h 0 do ( 'fg 'bg ) + over l@ over l@ ( 'fg 'bg fg-l bg-l ) + set-cursor-line ( 'fg 'bg ) + swap la1+ swap la1+ ( 'fg' 'bg' ) + loop ( 'fg 'bg ) + 2drop ( ) + flush-cursor-bits ( ) +; Modified: dev/olpc/touchpad/syntpad.fth ============================================================================== --- dev/olpc/touchpad/syntpad.fth Fri Jul 15 15:18:51 2011 (r2372) +++ dev/olpc/touchpad/syntpad.fth Sat Jul 16 13:37:09 2011 (r2373) @@ -49,6 +49,22 @@ patch start remote-mode open +0 value hw-cursor? +defer move-hw-cursor ( x y -- ) +' 2drop to move-hw-cursor +0 0 2value saved-cursor-fgbg + +: setup-hw-cursor ( -- ) + " cursor-xy!" screen-ih ihandle>phandle find-method if + to move-hw-cursor + " cursor-fgbg@" $call-screen to saved-cursor-fgbg + arrow-cursor h# ff00ff h# 00ff00 " set-cursor-image" $call-screen + true to hw-cursor? + else + false to hw-cursor? + then +; + \ The following code receives and decodes touchpad packets : show-packets ( adr len -- ) @@ -140,10 +156,12 @@ screen-w 2/ mouse-x ! screen-h 2/ mouse-y ! screen-ih package( bytes/line )package to /line load-base ptr ! + setup-hw-cursor ; : dot ( x y -- ) swap screen-w 3 - min swap y-offset + screen-h 3 - min ( x' y' ) + 2dup move-hw-cursor ( ) pixcolor @ -rot 3 3 ( color x y w h ) fill-rectangle-noff ( ) ; @@ -237,6 +255,10 @@ if track then exit-test? until + hw-cursor? if + " cursor-off" $call-screen + saved-cursor-fgbg " cursor-fgbg!" $call-screen + then close cursor-on page Modified: ofw/gui/mouse.fth ============================================================================== --- ofw/gui/mouse.fth Fri Jul 15 15:18:51 2011 (r2372) +++ ofw/gui/mouse.fth Sat Jul 16 13:37:09 2011 (r2373) @@ -7,17 +7,6 @@ 0 value xpos 0 value ypos -\ move-mouse-cursor ( x y - ) -\ remove-mouse-cursor ( - ) -\ poll-mouse ( -- x y buttons ) -\ get-event ( #msecs -- false | x y buttons true ) -\ 0 means wait forever, buttons are ...RML -\ trackmouse ( - ) invokes -\ defer handle-movement ( x-abs y-abs buttons -- done? ) -\ e.g. -\ ' 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 @@ -38,7 +27,7 @@ \ 04000000 , 06000000 , 02000000 , 00000000 , 06000000 , 06000000 , 00000000 , 00000000 , [else] -d# 17 constant cursor-w +d# 18 constant cursor-w d# 31 constant cursor-h create white-bits @@ -70,9 +59,9 @@ 00000000110000011000000000000000 , 00000000110000001100000000000000 , 00000000011000001100000000000000 , - 00000000011000000110000000000000 , - 00000000001100011000000000000000 , - 00000000000111110000000000000000 , + 00000000011000001100000000000000 , + 00000000001100001100000000000000 , + 00000000000111111000000000000000 , 00000000000111110000000000000000 , create black-bits @@ -104,21 +93,33 @@ 00000000001111110000000000000000 , 00000000000111110000000000000000 , 00000000000111110000000000000000 , - 00000000000011100000000000000000 , + 00000000000011110000000000000000 , 00000000000000000000000000000000 , 00000000000000000000000000000000 , hex [then] +: arrow-cursor ( -- 'fg 'bg w h ) + black-bits white-bits + cursor-w cursor-h +; +0 value hardware-cursor? 0 value /rect 0 value old-rect 0 value new-rect : alloc-mouse-cursor ( -- ) - 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 + " cursor-xy!" screen-ih ihandle>phandle find-method if ( xt ) + drop + true to hardware-cursor? + arrow-cursor 0 h# ffffff " set-cursor-image" $call-screen + else + false to hardware-cursor? + 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 + then ; : merge-cursor ( -- ) @@ -131,11 +132,16 @@ ; : remove-mouse-cursor ( -- ) + hardware-cursor? if " cursor-off" $call-screen exit then mouse-ih 0= if exit then xpos ypos old-rect put-cursor ; : draw-mouse-cursor ( -- ) mouse-ih 0= if exit then + hardware-cursor? if + xpos ypos " cursor-xy!" $call-screen + exit + then xpos ypos 2dup old-rect -rot ( x y adr x y ) cursor-w cursor-h read-rectangle ( x y ) old-rect new-rect /rect move ( x y ) @@ -178,6 +184,10 @@ close-mouse? if mouse-ih close-dev 0 to mouse-ih + hardware-cursor? if + false to hardware-cursor? + " cursor-off" $call-screen + then then ; : ?open-mouse ( -- )

1 0

[commit] r2372 - dev/usb2/hcd
by repository service July 15, 2011

July 15, 2011

Author: wmb Date: Fri Jul 15 15:18:51 2011 New Revision: 2372 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2372 Log: Added a small delay in hub selftest to give newly-inserted devices time to wake up. Modified: dev/usb2/hcd/probehub.fth Modified: dev/usb2/hcd/probehub.fth ============================================================================== --- dev/usb2/hcd/probehub.fth Fri Jul 15 10:20:04 2011 (r2371) +++ dev/usb2/hcd/probehub.fth Fri Jul 15 15:18:51 2011 (r2372) @@ -174,6 +174,7 @@ then ( port# ) repeat ( port# ) ." Device connected - probing ... " + d# 150 ms ( port# ) \ Wakeup time probe-setup ( port# ) hub-dev swap ['] probe-hub-port catch if ( x x ) 2drop ( )

1 0

[commit] r2371 - in cpu/arm: mmp2 olpc/1.75
by repository service July 15, 2011

July 15, 2011

Author: wmb Date: Fri Jul 15 10:20:04 2011 New Revision: 2371 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2371 Log: OLPC XO-1.75 - Slow down TWSI clock for accelerometer. Modified: cpu/arm/mmp2/twsi.fth cpu/arm/olpc/1.75/accelerometer.fth Modified: cpu/arm/mmp2/twsi.fth ============================================================================== --- cpu/arm/mmp2/twsi.fth Fri Jul 15 08:59:50 2011 (r2370) +++ cpu/arm/mmp2/twsi.fth Fri Jul 15 10:20:04 2011 (r2371) @@ -158,6 +158,11 @@ twsi-get ; +d# 12,600,000 constant numerator +: set-bus-speed ( hz -- ) \ Useful range is currently 25,000 .. 100,000 + child-address set-twsi-target + numerator swap / h# 1ff min h# 7e max lcr! +; : decode-unit ( adr len -- low high ) parse-2int ; : encode-unit ( low high -- adr len ) >r <# u#s drop [char] , hold r> u#s u#> ; end-package Modified: cpu/arm/olpc/1.75/accelerometer.fth ============================================================================== --- cpu/arm/olpc/1.75/accelerometer.fth Fri Jul 15 08:59:50 2011 (r2370) +++ cpu/arm/olpc/1.75/accelerometer.fth Fri Jul 15 10:20:04 2011 (r2371) @@ -47,6 +47,7 @@ : delay ( -- ) d# 30 ms ; : open ( -- flag ) my-address my-space " set-address" $call-parent + d# 25,000 " set-bus-speed" $call-parent ['] accelerometer-on catch 0= ; : close ( -- )

1 0

[commit] r2370 - cpu/arm/olpc/1.75
by repository service July 15, 2011

July 15, 2011

Author: wmb Date: Fri Jul 15 08:59:50 2011 New Revision: 2370 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2370 Log: Q4B04 Modified: cpu/arm/olpc/1.75/fw-version.fth Modified: cpu/arm/olpc/1.75/fw-version.fth ============================================================================== --- cpu/arm/olpc/1.75/fw-version.fth Fri Jul 15 08:58:58 2011 (r2369) +++ cpu/arm/olpc/1.75/fw-version.fth Fri Jul 15 08:59:50 2011 (r2370) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR B -macro: FW_MINOR 03 +macro: FW_MINOR 04

1 0

[commit] r2369 - cpu/arm/olpc/1.75
by repository service July 15, 2011

July 15, 2011

Author: wmb Date: Fri Jul 15 08:58:58 2011 New Revision: 2369 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2369 Log: OLPC XO-1.75 - EC 4.0.2.02 Modified: cpu/arm/olpc/1.75/ec-version.fth Modified: cpu/arm/olpc/1.75/ec-version.fth ============================================================================== --- cpu/arm/olpc/1.75/ec-version.fth Fri Jul 15 00:46:15 2011 (r2368) +++ cpu/arm/olpc/1.75/ec-version.fth Fri Jul 15 08:58:58 2011 (r2369) @@ -1,5 +1,5 @@ \ The EC microcode -macro: EC_VERSION 4_0_2_00 +macro: EC_VERSION 4_0_2_02 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary

1 0

[commit] r2368 - cpu/arm/olpc/1.75
by repository service July 15, 2011

July 15, 2011

Author: wmb Date: Fri Jul 15 00:46:15 2011 New Revision: 2368 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2368 Log: Q4B03 Modified: cpu/arm/olpc/1.75/fw-version.fth Modified: cpu/arm/olpc/1.75/fw-version.fth ============================================================================== --- cpu/arm/olpc/1.75/fw-version.fth Thu Jul 14 14:54:21 2011 (r2367) +++ cpu/arm/olpc/1.75/fw-version.fth Fri Jul 15 00:46:15 2011 (r2368) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR B -macro: FW_MINOR 02 +macro: FW_MINOR 03

1 0

[commit] r2367 - dev/olpc/kb3700
by repository service July 14, 2011

July 14, 2011

Author: wmb Date: Thu Jul 14 14:54:21 2011 New Revision: 2367 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2367 Log: OLPC XO-1.75 - avoid EC command timeouts in the EC-SPI protocol by draining the FIFO if the EC has timed out and sent extra packets, acking only when the FIFO is empty. Modified: dev/olpc/kb3700/spicmd.fth Modified: dev/olpc/kb3700/spicmd.fth ============================================================================== --- dev/olpc/kb3700/spicmd.fth Thu Jul 14 10:01:12 2011 (r2366) +++ dev/olpc/kb3700/spicmd.fth Thu Jul 14 14:54:21 2011 (r2367) @@ -261,16 +261,22 @@ ['] switched to do-state ( ) pulse-ack ; +: ?do-ack ( -- ) + \ If there is more data in the FIFO, it means that the EC + \ timed out and "inferred" an ACK, so we don't ACK until + \ the FIFO is empty. + ssp-ready? 0= if prime-fifo pulse-ack then +; : (upstream) ( -- ) ssp-ssdr rl@ ssp-ssdr rl@ ( channel# data ) debug? if ." UP: " over . dup . cr then over case ( channel# data ) - 0 of 2drop prime-fifo pulse-ack endof ( channel# data ) \ Invalid + 0 of 2drop ?do-ack endof ( channel# data ) \ Invalid 1 of 2drop handoff-command endof ( channel# data ) \ Switched ( default ) ( channel# data channel# ) - enque prime-fifo pulse-ack ( channel# ) + enque ?do-ack ( channel# ) endcase ; ' (upstream) to upstream @@ -331,6 +337,9 @@ open-count 1- 0 max to open-count ; +: drain ( -- ) + begin ssp-ready? while poll repeat +; : data-command ( databuf datalen datain? cmdadr cmdlen more? -- ) to sticky? to cmdlen to cmdbuf to datain? to datalen to databuf @@ -338,6 +347,7 @@ set-cmd-timeout ['] do-state behavior ['] upstream = if + drain set-cmd else handoff-command

1 0