Date: Sat, 17 May 2008 21:04:12 GMT From: Andrew Thompson <thompsa@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 141786 for review Message-ID: <200805172104.m4HL4CsP028453@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=141786 Change 141786 by thompsa@thompsa_burger on 2008/05/17 21:03:43 The NEW_BCM2050_RSSI calcs work, remove old version. Affected files ... .. //depot/projects/vap/sys/dev/bwi/bwirf.c#7 edit Differences ... ==== //depot/projects/vap/sys/dev/bwi/bwirf.c#7 (text+ko) ==== @@ -2416,8 +2416,6 @@ flags1 = le16toh(hdr->rxh_flags1); flags3 = le16toh(hdr->rxh_flags3); -#define NEW_BCM2050_RSSI -#ifdef NEW_BCM2050_RSSI if (flags1 & BWI_RXH_F1_OFDM) { if (rssi > 127) rssi -= 256; @@ -2475,40 +2473,6 @@ default: panic("impossible lna gain %d", lna_gain); } -#else /* !NEW_BCM2050_RSSI */ - lna_gain = 0; /* shut up gcc warning */ - - if (flags1 & BWI_RXH_F1_OFDM) { - if (rssi > 127) - rssi -= 256; - rssi = (rssi * 73) / 64; - - if (flags3 & BWI_RXH_F3_BCM2050_RSSI) - rssi += 25; - else - rssi -= 3; - return rssi; - } - - if (mac->mac_sc->sc_card_flags & BWI_CARD_F_SW_NRSSI) { - struct bwi_rf *rf = &mac->mac_rf; - - if (rssi >= BWI_NRSSI_TBLSZ) - rssi = BWI_NRSSI_TBLSZ - 1; - - rssi = ((31 - (int)rf->rf_nrssi_table[rssi]) * -131) / 128; - rssi -= 57; - } else { - rssi = ((31 - rssi) * -149) / 128; - rssi -= 68; - } - - if (mac->mac_phy.phy_mode != IEEE80211_MODE_11G) - return rssi; - - if (flags3 & BWI_RXH_F3_BCM2050_RSSI) - rssi += 25; -#endif /* NEW_BCM2050_RSSI */ return rssi; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200805172104.m4HL4CsP028453>