Changeset 3132

Timestamp:

Aug 8, 2012 9:36:09 AM (10 months ago)

Author:

quozl

Message:

ARM - TWSI, twsi-write takes an address and length, twsi-out takes bytes on stack, but both achieve the same

Location:

cpu/arm

Files:

• mmp2/boardtwsi.fth (modified) (1 diff)
• mmp2/dsi.fth (modified) (1 diff)
• mmp2/twsi.fth (modified) (1 diff)
• mmp3/thunderstone/boardtwsi.fth (modified) (1 diff)

cpu/arm/mmp2/boardtwsi.fth

@@ -69 +69 @@
 : init-pals  ( -- )
    h# b0 4 set-twsi-target  \ Set PS parameters address
-   0 1 twsi-write     \ clear interrupt settings
+   0 1 twsi-out             \ clear interrupt settings
 
    h# 22 4 set-twsi-target  \ Device init address
-   h# 10 1 twsi-write \ Init device
+   h# 10 1 twsi-out         \ Init device
 
    h# 20 4 set-twsi-target  \ Ambient Light Sensor address
-   2 1 twsi-write     \ Enable ALS in most sensitive mode, 16-bit data
+   2 1 twsi-out             \ Enable ALS in most sensitive mode, 16-bit data
 ;
 : als@  ( -- n )

cpu/arm/mmp2/dsi.fth

@@ -7 +7 @@
 
 : dsi-twsi!  ( l reg# -- )
-   >r  lbsplit  swap 2swap swap  r> wbsplit  6  twsi-write
+   >r  lbsplit  swap 2swap swap  r> wbsplit  6  twsi-out
 ; 
 : dsi-twsi-w!  ( w reg# -- )
-   >r  wbsplit  swap  r> wbsplit  4  twsi-write
+   >r  wbsplit  swap  r> wbsplit  4  twsi-out
 ; 
 : dsi-twsi@  ( reg# -- l )  wbsplit 2 4 twsi-get  bljoin  ;

cpu/arm/mmp2/twsi.fth

@@ -146 +146 @@
 ;
 : twsi-write  ( adr len -- )
-   0=  if  exit  then                 ( adr len )
+   dup 0=  if  2drop exit  then       ( adr len )
    slave-address twsi-start           ( adr len )
 

cpu/arm/mmp3/thunderstone/boardtwsi.fth

@@ -69 +69 @@
 : init-pals  ( -- )
    h# b0 4 set-twsi-target  \ Set PS parameters address
-   0 1 twsi-write     \ clear interrupt settings
+   0 1 twsi-out             \ clear interrupt settings
 
    h# 22 4 set-twsi-target  \ Device init address
-   h# 10 1 twsi-write \ Init device
+   h# 10 1 twsi-out         \ Init device
 
    h# 20 4 set-twsi-target  \ Ambient Light Sensor address
-   2 1 twsi-write     \ Enable ALS in most sensitive mode, 16-bit data
+   2 1 twsi-out             \ Enable ALS in most sensitive mode, 16-bit data
 ;
 : als@  ( -- n )