From owner-p4-projects@FreeBSD.ORG  Tue Nov 25 14:39:17 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 53DC11065677; Tue, 25 Nov 2008 14:39:17 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0DD3C1065675
	for <perforce@FreeBSD.org>; Tue, 25 Nov 2008 14:39:17 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 01FD78FC0C
	for <perforce@FreeBSD.org>; Tue, 25 Nov 2008 14:39:17 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAPEdGMZ061164
	for <perforce@FreeBSD.org>; Tue, 25 Nov 2008 14:39:16 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAPEdGrq061162
	for perforce@freebsd.org; Tue, 25 Nov 2008 14:39:16 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Tue, 25 Nov 2008 14:39:16 GMT
Message-Id: <200811251439.mAPEdGrq061162@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 153525 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, 25 Nov 2008 14:39:17 -0000

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

Change 153525 by hselasky@hselasky_laptop001 on 2008/11/25 14:39:09

	
	Remove misplaced USB ID. Be more verbose printing out RF version.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#19 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#19 (text+ko) ====

@@ -171,7 +171,6 @@
 	{USB_VPI(USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2570, 0)},
 	{USB_VPI(USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2570_2, 0)},
 	{USB_VPI(USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2570_3, 0)},
-	{USB_VPI(USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2573, 0)},
 	{USB_VPI(USB_VENDOR_SIEMENS2, USB_PRODUCT_SIEMENS2_WL54G, 0)},
 	{USB_VPI(USB_VENDOR_SMC, USB_PRODUCT_SMC_2862WG, 0)},
 	{USB_VPI(USB_VENDOR_SPHAIRON, USB_PRODUCT_SPHAIRON_UB801R, 0)},
@@ -780,8 +779,9 @@
 	/* retrieve MAC address and various other things from EEPROM */
 	ural_cfg_read_eeprom(sc);
 
-	printf("%s: MAC/BBP RT2570 (rev 0x%02x), RF %s\n",
-	    sc->sc_name, sc->sc_asic_rev, ural_get_rf(sc->sc_rf_rev));
+	printf("%s: MAC/BBP RT2570 (rev 0x%02x), RF %s (0x%02x)\n",
+	    sc->sc_name, sc->sc_asic_rev, ural_get_rf(sc->sc_rf_rev),
+	    sc->sc_rf_rev);
 
 	mtx_unlock(&sc->sc_mtx);
 
@@ -954,8 +954,11 @@
 static const char *
 ural_get_rf(int rev)
 {
+	;				/* style fix */
+
 	switch (rev) {
-		case RAL_RF_2522:return "RT2522";
+	case RAL_RF_2522:
+		return "RT2522";
 	case RAL_RF_2523:
 		return "RT2523";
 	case RAL_RF_2524: