[openfirmware] r1631 - dev
svn at openfirmware.info
svn at openfirmware.info
Fri Dec 18 04:44:13 CET 2009
Author: wmb
Date: 2009-12-18 04:44:13 +0100 (Fri, 18 Dec 2009)
New Revision: 1631
Modified:
dev/libertas.fth
Log:
Marvel WLAN driver - inability to read the MAC adress from the
WLAN module is now a hard failure.
Modified: dev/libertas.fth
===================================================================
--- dev/libertas.fth 2009-12-17 23:54:58 UTC (rev 1630)
+++ dev/libertas.fth 2009-12-18 03:44:13 UTC (rev 1631)
@@ -590,11 +590,12 @@
respbuf >fw-data 2 + mac-adr$ move
false
;
-: marvel-get-mac-address ( -- )
+: marvel-get-mac-address ( -- error? )
4 0 do
- (marvel-get-mac-address) 0= if unloop exit then
+ (marvel-get-mac-address) 0= if false unloop exit then
loop
." marvel-get-mac-address failed" cr
+ true
;
: marvel-set-mac-address ( -- )
@@ -1523,14 +1524,15 @@
headers
-: ?make-mac-address-property ( -- )
- driver-state ds-ready < if exit then
- " mac-address" get-my-property if
- marvel-get-mac-address
+: ?make-mac-address-property ( -- error? )
+ driver-state ds-ready < if false exit then
+ " mac-address" get-my-property if ( )
+ marvel-get-mac-address if true exit then
mac-adr$ encode-bytes " local-mac-address" property
mac-address encode-bytes " mac-address" property
- else
- 2drop
+ false
+ else ( adr len )
+ 2drop false
then
;
: set-frame-size ( -- )
@@ -1542,7 +1544,7 @@
;
: init-net ( -- )
- ?make-mac-address-property
+ ?make-mac-address-property drop
;
: ?load-fw ( -- error? )
@@ -1553,8 +1555,7 @@
then
ds-ready to driver-state
then
- init-net
- false
+ ?make-mac-address-property
;
false instance value use-promiscuous?
More information about the openfirmware
mailing list