Changeset 3038

Timestamp:

Jul 4, 2012 6:18:52 PM (11 months ago)

Author:

wmb

Message:

PCI bus driver - fixed a problem introduced by svn 3021 (the code change to make phandles relative wasn't complete).

Files:

• dev/pcibus.fth (modified) (2 diffs)
• ofw/core/ofwcore.fth (modified) (1 diff)

dev/pcibus.fth

@@ -1049 +1049 @@
 ;
 
-\ XXX In order to implement put-package-property with standard words,
-\ we would have to:
-\ a) Save my-self and set it to 0
-\ b) Get the package's "reg" property value with get-package-property
-\ c) Convert the first entry therein to a string of the form "@D,F"
-\ d) Pass that string to find-device to make that package the active package
-\ e) Create the property
-\ f) Restore my-self
-
-: put-package-property  ( value$ name$ phandle -- )
-   current token@ >r  context token@ >r   execute  ( value$ name$ )
-   (property)
-   r> context token!  r> current token!
-;
-
 0 value aa-adr
 0 value aa-len
@@ -1069 +1054 @@
 : finish-aa-property  ( phandle -- )
    aa-len  if
-      >r  aa-adr aa-len  " assigned-addresses"  r> put-package-property
+      >r  aa-adr aa-len  " assigned-addresses"  r> set-package-property
    else
       drop

ofw/core/ofwcore.fth

@@ -2161 +2161 @@
 : get-package-property  ( adr len phandle -- true | adr' len' false )
    (push-package)  get-property  (pop-package)
+;
+
+: set-package-property  ( value$ name$ phandle -- )
+   current token@ >r  context token@ >r   (select-package)  ( value$ name$ )
+   (property)
+   r> context token!  r> current token!
 ;