Changeset 3171

Timestamp:

Aug 14, 2012 10:42:28 PM (9 months ago)

Author:

wmb

Message:

OLPC - Renamed gpio-prop to gpio-property and changed the argument order for conformance with Forth conventions.

Location:

cpu/arm/mmp2

Files:

• gpio.fth (modified) (1 diff)
• twsi.fth (modified) (1 diff)

cpu/arm/mmp2/gpio.fth

@@ -79 +79 @@
 end-package
 
-: gpio-prop ( $gpioname low? gpionum -- )
-   " /gpio"  encode-phandle        ( $gpioname low? gpionum propval$ )
-   rot    encode-int encode+         ( $gpioname low? propval$' )
-   rot    encode-int encode+         ( $gpioname propval$' )
-   2swap property
+: gpio-property  ( gpionum low? gpioname$ -- )
+   2>r swap                     ( low? gpionum           r: gpioname$ )
+   " /gpio"  encode-phandle     ( low? gpionum propval$  r: gpioname$ )
+   rot encode-int encode+       ( low? propval$'         r: gpioname$ )
+   rot encode-int encode+       ( propval$'              r: gpioname$ )
+   2r> property                 ( )
 ;
-
-

cpu/arm/mmp2/twsi.fth

@@ -214 +214 @@
    " zforce" +compatible
    my-address my-space 1 reg
-   " reset-gpio" 1  d# 98  gpio-prop
-   " test-gpio"  1  d# 139 gpio-prop
-   " hd-gpio"    1  d# 12  gpio-prop
-   " dr-gpio"    1  d# 99  gpio-prop
+   touch-rst-gpio# 1  " reset-gpio" gpio-property
+   touch-tck-gpio# 1  " test-gpio"  gpio-property
+   touch-hd-gpio#  1  " hd-gpio"    gpio-property
+   touch-int-gpio# 1  " dr-gpio"    gpio-property
 end-package
 [then]