Changeset 3046

Timestamp:

Jul 10, 2012 9:16:44 PM (11 months ago)

Author:

wmb

Message:

ARM MMP2 - added io!@ routine for accessing slow IO registers that need to be read back after writing.

Location:

cpu/arm/mmp2

Files:

• mfpr.fth (modified) (1 diff)
• socregs.fth (modified) (1 diff)

cpu/arm/mmp2/mfpr.fth

@@ -47 +47 @@
 : no-update,  ( -- )  8 w,  ;  \ 8 is a reserved bit; the code skips these
 : af@  ( gpio# -- function# )  gpio>mfpr io@  ;
-: af!  ( function# gpio# -- )  gpio>mfpr io!  ;
+: af!  ( function# gpio# -- )  gpio>mfpr io!@  ;
 
 : +edge-clr     ( n -- n' )  h#   40 or  ;
+: +very-slow    ( n -- n' )  h# 0000 or  ;
+: +slow         ( n -- n' )  h# 0800 or  ;
 : +medium       ( n -- n' )  h# 1000 or  ;
 : +fast         ( n -- n' )  h# 1800 or  ;

cpu/arm/mmp2/socregs.fth

@@ -5 +5 @@
 : io!  ( value offset -- )  +io l!  ;
 : io@  ( offset -- value )  +io l@  ;
+: io!@  ( value offset -- )  tuck io! io@ drop  ;  \ For slow registers like MFPRs
 
 : +apbc  ( offset -- io-offset )  h# 01.5000 +  ;  \ APB Clock Unit