Changeset 3560

Timestamp:

Feb 20, 2013 12:10:44 AM (3 months ago)

Author:

quozl

Message:

OLPC - libertas, fix failure during test /wlan on 8686, by returning separate scan response result and length.

Files:

• dev/libertas.fth (modified) (3 diffs)
• ofw/wifi/data.fth (modified) (1 diff)
• ofw/wifi/eapol.fth (modified) (2 diffs)

dev/libertas.fth

@@ -1218 +1218 @@
 ;
 
-: scan  ( adr len chan -- actual )
-   dup channel-is-5ghz?  802.11n?  0=  and  if  3drop 0 exit  then
+: scan  ( adr len chan -- false | actual true )
    >r                           ( adr len r: chan )
    begin
@@ -1227 +1226 @@
    repeat                       ( adr len scan-adr scan-len err? r: chan )
    r> drop                      ( adr len scan-adr scan-len err? )
-   if  2drop 0 exit  then       ( adr len scan-adr scan-len )
+   if  4drop false exit  then   ( adr len scan-adr scan-len )
    rot min >r                   ( adr scan-adr r: actual )
    swap r@ move                 ( r: actual )
    r>                           ( actual )
+   true
 ;
 
@@ -2446 +2446 @@
 : ta-scan  ( -- )
    ." scan"  cr
-   (scan-all) drop
+   " scan-all" $call-supplicant drop
 ;
 

ofw/wifi/data.fth

@@ -9 +9 @@
 : write-force  ( adr len -- actual )  " write-force" $call-parent  ;
 : read-force   ( adr len -- actual )  " read-force"  $call-parent  ;
-: scan  ( adr len chan -- actual )  " scan"  $call-parent  ;
+: scan  ( adr len chan -- false | actual true )  " scan"  $call-parent  ;
 : enable-rsn   ( -- )  " enable-rsn"  $call-parent drop  ;
 : disable-rsn  ( -- )  " disable-rsn" $call-parent drop  ;

ofw/wifi/eapol.fth

@@ -951 +951 @@
    scan-order /scan-order bounds do           ( )
       scanbuf /buf  i c@                      ( adr len chan )
-      scan  dup if                            ( actual )
-         scanbuf swap                         ( adr len )
-         2dup .ssids                          ( adr len )
-         test-association
-      else                                    ( actual )
-         drop unloop true exit
+      scan  if                                ( actual )
+         ?dup  if                             ( actual )
+            scanbuf swap                      ( adr actual )
+            2dup .ssids                       ( adr actual )
+            test-association
+         then
+      else                                    ( )
+         unloop true exit
       then
    loop
@@ -970 +972 @@
    scan-order /scan-order bounds do           ( )
       scanbuf /buf  i c@                      ( adr len chan )
-      scan  if                                ( )
-         debug?  if  scanbuf .scan  then      ( )
-         ssid$ (select-ssid?)                 ( found? )
-         if  ." found"  cr unloop true exit  then
+      scan  if                                ( actual )
+         if                                   ( )
+            debug?  if  scanbuf .scan  then   ( )
+            ssid$ (select-ssid?)              ( found? )
+            if
+               ." found"  cr unloop true exit
+            then                              ( )
+         then
       then
    loop
-   ." not found"  cr  false                  ( found? )
+   ." not found"  cr  false                   ( found? )
 ;