[commit] r2235 - in dev/usb2/hcd: . ehci

[repository service]

Author: wmb
Date: Tue May 31 21:33:27 2011
New Revision: 2235
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2235

Log:
USB - moved some functions from an EHCI-specific file to a common file to fix compilation errors for other host controllers.

Modified:
   dev/usb2/hcd/device.fth
   dev/usb2/hcd/ehci/probe.fth
   dev/usb2/hcd/probehub.fth

Modified: dev/usb2/hcd/device.fth
==============================================================================
--- dev/usb2/hcd/device.fth	Tue May 31 01:23:49 2011	(r2234)
+++ dev/usb2/hcd/device.fth	Tue May 31 21:33:27 2011	(r2235)
@@ -491,6 +491,17 @@
    drop false                                          ( false )
 ;

+: probe-setup  ( -- )
+   \ Set active-package so device nodes can be added and removed
+   my-self ihandle>phandle push-package
+
+   alloc-pkt-buf
+;
+: probe-teardown  ( -- )
+   free-pkt-buf
+   pop-package
+;
+
 headers

\ LICENSE_BEGIN

Modified: dev/usb2/hcd/ehci/probe.fth
==============================================================================
--- dev/usb2/hcd/ehci/probe.fth	Tue May 31 01:23:49 2011	(r2234)
+++ dev/usb2/hcd/ehci/probe.fth	Tue May 31 21:33:27 2011	(r2235)
@@ -42,17 +42,6 @@
    dup portsc@ swap portsc!       ( )		\ Clear connection change bit
 ;

-: probe-setup  ( -- )
-   \ Set active-package so device nodes can be added and removed
-   my-self ihandle>phandle push-package
-
-   alloc-pkt-buf
-;
-: probe-teardown  ( -- )
-   free-pkt-buf
-   pop-package
-;
-
 : #testable-ports  ( -- n )
    #ports                                            ( #hardware-ports )
    " usb-test-ports" get-inherited-property  0=  if  ( #hardware-ports adr len )

Modified: dev/usb2/hcd/probehub.fth
==============================================================================
--- dev/usb2/hcd/probehub.fth	Tue May 31 01:23:49 2011	(r2234)
+++ dev/usb2/hcd/probehub.fth	Tue May 31 21:33:27 2011	(r2235)
@@ -193,7 +193,7 @@
    " hub-port-mask" get-inherited-property  if	( )
       -1					( mask )
    else						( propval$ )
-      get-encoded-int				( mask )
+      decode-int nip nip			( mask )
    then						( mask )
    to hub-test-mask				( )