From owner-p4-projects@FreeBSD.ORG  Tue Feb 27 10:42:34 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A95D816A406; Tue, 27 Feb 2007 10:42:34 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 6D05A16A401
	for <perforce@FreeBSD.org>; Tue, 27 Feb 2007 10:42:34 +0000 (UTC)
	(envelope-from sephe@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 5AFF513C481
	for <perforce@FreeBSD.org>; Tue, 27 Feb 2007 10:42:34 +0000 (UTC)
	(envelope-from sephe@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1RAgY5D093874
	for <perforce@FreeBSD.org>; Tue, 27 Feb 2007 10:42:34 GMT
	(envelope-from sephe@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1RAgXR6093871
	for perforce@freebsd.org; Tue, 27 Feb 2007 10:42:34 GMT
	(envelope-from sephe@FreeBSD.org)
Date: Tue, 27 Feb 2007 10:42:34 GMT
Message-Id: <200702271042.l1RAgXR6093871@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sephe@FreeBSD.org using -f
From: Sepherosa Ziehau <sephe@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 115111 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Feb 2007 10:42:35 -0000

http://perforce.freebsd.org/chv.cgi?CH=115111

Change 115111 by sephe@sephe_zealot:sam_wifi on 2007/02/27 10:42:17

	Convert RSSI to receive signal strength for ural(4)
	
	Reviewed by:	sam@
	Approved by:	sam@

Affected files ...

.. //depot/projects/wifi/sys/dev/usb/if_ural.c#15 edit
.. //depot/projects/wifi/sys/dev/usb/if_uralreg.h#3 edit

Differences ...

==== //depot/projects/wifi/sys/dev/usb/if_ural.c#15 (text+ko) ====

@@ -78,6 +78,10 @@
 #define DPRINTFN(n, x)
 #endif
 
+#define URAL_RSSI(rssi)					\
+	((rssi) > (RAL_NOISE_FLOOR + RAL_RSSI_CORR) ?	\
+	 ((rssi) - RAL_NOISE_FLOOR + RAL_RSSI_CORR) : 0)
+
 /* various supported device vendors/products */
 static const struct usb_devno ural_devs[] = {
 	{ USB_VENDOR_ASUS,		USB_PRODUCT_ASUS_WL167G },
@@ -986,7 +990,7 @@
 		tap->wr_chan_freq = htole16(ic->ic_curchan->ic_freq);
 		tap->wr_chan_flags = htole16(ic->ic_curchan->ic_flags);
 		tap->wr_antenna = sc->rx_ant;
-		tap->wr_antsignal = desc->rssi;
+		tap->wr_antsignal = URAL_RSSI(desc->rssi);
 
 		bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_rxtap_len, m);
 	}
@@ -995,7 +999,7 @@
 	ni = ieee80211_find_rxnode(ic, (struct ieee80211_frame_min *)wh);
 
 	/* send the frame to the 802.11 layer */
-	ieee80211_input(ic, m, ni, desc->rssi, -95/*XXX*/, 0);
+	ieee80211_input(ic, m, ni, URAL_RSSI(desc->rssi), RAL_NOISE_FLOOR, 0);
 
 	/* node is no longer needed */
 	ieee80211_free_node(ni);

==== //depot/projects/wifi/sys/dev/usb/if_uralreg.h#3 (text+ko) ====

@@ -17,6 +17,9 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#define RAL_NOISE_FLOOR		-95
+#define RAL_RSSI_CORR		120
+
 #define RAL_RX_DESC_SIZE	(sizeof (struct ural_rx_desc))
 #define RAL_TX_DESC_SIZE	(sizeof (struct ural_tx_desc))