[openfirmware] [commit] r1735 - dev/usb2/device/wlan

[repository service]

Author: wmb
Date: Sat Feb 13 06:47:01 2010
New Revision: 1735
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1735

Log:
OLPC XO-1.0 - fixed regression in wireless firmware download result checking.

Modified:
   dev/usb2/device/wlan/fw8388.fth

Modified: dev/usb2/device/wlan/fw8388.fth
==============================================================================
--- dev/usb2/device/wlan/fw8388.fth	Sat Feb 13 06:45:40 2010	(r1734)
+++ dev/usb2/device/wlan/fw8388.fth	Sat Feb 13 06:47:01 2010	(r1735)
@@ -28,8 +28,9 @@
 constant /boot-ack
 
 \ >cmd-ack-status
-0 constant boot-ack-ok			\ Download ok
-1 constant boot-ack-fail		\ Download failed
+1 constant boot-ack-ok			\ Download ok
+\ 0 constant boot-ack-fail		\ Download failed
+\ 2 constant boot-ack-unsupported	\ Unsupported command
 
 \ USB image download request structure
 struct
@@ -73,11 +74,12 @@
       " Bad command status length" vtype
       false exit
    then                                     ( adr )
-   >boot-magic le-l@  case                  ( )
-      0 of  false exit  endof  \ BOOT_CMD_RESP_FAIL
-      1 of  true  exit  endof  \ BOOT_CMD_RESP_OK
-      2 of  false exit  endof  \ BOOT_CMD_RESP_NOT_SUPPORTED
-   endcase
+   dup >boot-magic le-l@ boot-magic <>  if  ( adr )
+      drop                                  ( )
+      " Bad magic number in boot response" vtype  ( )
+      false exit
+   then                                     ( adr )
+   >cmd-status c@ boot-ack-ok =             ( ok? )
 ;
 
 : wait-cmd-fw-dl-ack  ( -- acked? )