[commit] r3149 - dev

[repository service]

Author: quozl
Date: Fri Aug 10 07:20:13 2012
New Revision: 3149
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3149

Log:
OLPC XO-1.5 XO-1.75 - libertas, change baseband register interpretation to match new data supplied

Modified:
   dev/libertas.fth

Modified: dev/libertas.fth
==============================================================================
--- dev/libertas.fth	Fri Aug 10 02:15:54 2012	(r3148)
+++ dev/libertas.fth	Fri Aug 10 07:20:13 2012	(r3149)
@@ -2194,10 +2194,22 @@
    2 .r
 ;

-: .bpp-antenna  ( antenna -- )
-   dup h# 30 =  if ."  1" drop exit  then
-   dup h# 70 =  if ."  2" drop exit  then
-   2 .r
+: .rx-antenna  ( antenna -- )
+   6 rshift
+   case
+      b# 00  of  ."  0"  endof
+      b# 01  of  ."  1"  endof
+      b# 10  of  ."  d"  endof
+   endcase
+;
+
+: .tx-antenna  ( antenna -- )
+   6 rshift
+   case
+      b# 00  of  ."  0"  endof
+      b# 01  of  ."  1"  endof
+      b# 10  of  ."  r"  endof
+   endcase
 ;

: show-antenna  ( -- )
@@ -2209,10 +2221,8 @@
    get-antenna                          ( base antenna )
    hex
    ."  ant" .antenna                    ( base )
-   ."  rx "
-   h# 3f bbp-reg@ .bpp-antenna
-   ."  tx "
-   h# 40 bbp-reg@ .bpp-antenna
+   ."  rx "  h# 3f bbp-reg@ .rx-antenna
+   ."  tx "  h# 40 bbp-reg@ .tx-antenna
    base !
 ;