Changeset 3258

Timestamp:

Aug 31, 2012 1:42:31 AM (9 months ago)

Author:

wmb

Message:

OLPC ARM - Converted the RTC driver to use the new TWSI factoring, at the same time changing all occurrences of the method names "byte@" and "byte!" to "reg-b@" and "reg-b!".

Location:

cpu/arm

Files:

• mmp2/twsi-node.fth (modified) (1 diff)
• mmp2/twsi-package.fth (modified) (1 diff)
• olpc/accelerometer.fth (modified) (1 diff)
• olpc/rtc.fth (modified) (3 diffs)

cpu/arm/mmp2/twsi-node.fth

@@ -58 +58 @@
 : get  ( #bytes -- bytes ... )  0 swap  bytes-out-in  ;
 
-: byte@  ( -- )  " byte@" $call-twsi  ;
-: byte!  ( -- )  " byte!" $call-twsi  ;
+: reg-b@  ( reg# -- b )  " reg-b@" $call-twsi  ;
+: reg-b!  ( b reg# -- )  " reg-b!" $call-twsi  ;
 : bytes-out  ( byte .. #bytes -- )  " bytes-out" $call-twsi  ;
 

cpu/arm/mmp2/twsi-package.fth

@@ -137 +137 @@
 ;
 
-: byte@  ( reg -- byte )  1 1 bytes-out-in  ;
-: byte!  ( byte reg -- )  2 bytes-out  ;
+: reg-b@  ( reg -- byte )  1 1 bytes-out-in  ;
+: reg-b!  ( byte reg -- )  2 bytes-out  ;
 
 : set-bus-standard  cr-set  h# 18000 invert and              to cr-set  ;

cpu/arm/olpc/accelerometer.fth

@@ -10 +10 @@
 
 \ We could call this just once in open if we had a TWSI parent node
-: acc-reg@  ( reg# -- b )  " byte@" $call-parent  ;
-: acc-reg!  ( b reg# -- )  " byte!" $call-parent  ;
+: acc-reg@  ( reg# -- b )  " reg-b@" $call-parent  ;
+: acc-reg!  ( b reg# -- )  " reg-b!" $call-parent  ;
 : ctl1!  ( b -- )  h# 20 acc-reg!  ;
 : ctl4!  ( b -- )  h# 23 acc-reg!  ;

cpu/arm/olpc/rtc.fth

@@ -3 +3 @@
 dev /i2c@d4031000  \ TWSI2
 new-device
-   " rtc" name
-   " idt,idt1338-rtc" +compatible
-   h# 68 1 reg
 
-[ifdef] cl2-a1
-: set-address  ( -- )
-   rtc-scl-gpio# to smb-clock-gpio#
-   rtc-sda-gpio# to smb-data-gpio#
-   h# 68 to smb-slave
-;
-: rtc@  ( reg# -- byte )  set-address  smb-byte@  ;
-: rtc!  ( byte reg# -- )  set-address  smb-byte!  ;
-[else]
-: set-address  ( -- )   h# 68 2 set-twsi-target  ;
-: rtc@  ( reg# -- byte )  set-address  twsi-b@  ;
-: rtc!  ( byte reg# -- )  set-address  twsi-b!  ;
-[then]
+" rtc" name
+" idt,idt1338-rtc" +compatible
+h# 68 1 reg
+
+: rtc@  ( reg# -- byte )  " reg-b@" $call-parent  ;
+: rtc!  ( byte reg# -- )  " reg-b!" $call-parent  ;
 
 headerless
@@ -34 +24 @@
 headers
 : open  ( -- okay )
+   my-unit " set-address" $call-parent
+
    0 ['] rtc@ catch  if        ( x )
       drop false  exit         ( -- false )
@@ -59 +51 @@
 
 : bcd-time&date  ( -- s m h d m y century )
-   set-address
-[ifdef] cl2-a1
-   9 0 smb-read-n  ( s m h dow d m y control c )
-[else]
-   0 1 9 twsi-get  ( s m h dow d m y control c )
-[then]
+   0 1 9 " bytes-out-in" $call-parent  ( s m h dow d m y control c )
    nip             ( s m h dow d m y c )
    4 roll drop     ( s m h d m y c )