From owner-p4-projects@FreeBSD.ORG  Thu Oct 11 09:49:03 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A82EE16A468; Thu, 11 Oct 2007 09:49:03 +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 506FF16A420
	for <perforce@freebsd.org>; Thu, 11 Oct 2007 09:49:03 +0000 (UTC)
	(envelope-from kevlo@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6332713C4A3
	for <perforce@freebsd.org>; Thu, 11 Oct 2007 09:49:03 +0000 (UTC)
	(envelope-from kevlo@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9B9n3uR008956
	for <perforce@freebsd.org>; Thu, 11 Oct 2007 09:49:03 GMT
	(envelope-from kevlo@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9B9n3qU008953
	for perforce@freebsd.org; Thu, 11 Oct 2007 09:49:03 GMT
	(envelope-from kevlo@freebsd.org)
Date: Thu, 11 Oct 2007 09:49:03 GMT
Message-Id: <200710110949.l9B9n3qU008953@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kevlo@freebsd.org using -f
From: Kevin Lo <kevlo@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127382 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: Thu, 11 Oct 2007 09:49:03 -0000

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

Change 127382 by kevlo@kevlo_rtsl on 2007/10/11 09:48:47

	Do a boardflags workaround for Dell boards.

Affected files ...

.. //depot/projects/wifi/sys/dev/bwi/if_bwi.c#7 edit
.. //depot/projects/wifi/sys/dev/bwi/if_bwireg.h#2 edit

Differences ...

==== //depot/projects/wifi/sys/dev/bwi/if_bwi.c#7 (text+ko) ====

@@ -873,16 +873,23 @@
 bwi_get_card_flags(struct bwi_softc *sc)
 {
 #define	PCI_VENDOR_APPLE 0x106b
+#define	PCI_VENDOR_DELL  0x1028
 	sc->sc_card_flags = bwi_read_sprom(sc, BWI_SPROM_CARD_FLAGS);
 	if (sc->sc_card_flags == 0xffff)
 		sc->sc_card_flags = 0;
 
+	if (sc->sc_pci_subvid == PCI_VENDOR_DELL &&
+	    sc->sc_bbp_id == BWI_BBPID_BCM4301 &&
+	    sc->sc_pci_revid == 0x74)
+		sc->sc_card_flags |= BWI_CARD_F_BT_COEXIST;
+
 	if (sc->sc_pci_subvid == PCI_VENDOR_APPLE &&
 	    sc->sc_pci_subdid == 0x4e && /* XXX */
 	    sc->sc_pci_revid > 0x40)
 		sc->sc_card_flags |= BWI_CARD_F_PA_GPIO9;
 
 	DPRINTF(sc, "card flags 0x%04x\n", sc->sc_card_flags);
+#undef PCI_VENDOR_DELL
 #undef PCI_VENDOR_APPLE
 }
 

==== //depot/projects/wifi/sys/dev/bwi/if_bwireg.h#2 (text+ko) ====

@@ -391,6 +391,7 @@
 /*
  * SPROM card flags
  */
+#define BWI_CARD_F_BT_COEXIST		__BIT(0)	/* Bluetooth coexist */
 #define BWI_CARD_F_PA_GPIO9		__BIT(1)	/* GPIO 9 controls PA */
 #define BWI_CARD_F_SW_NRSSI		__BIT(3)
 #define BWI_CARD_F_NO_SLOWCLK		__BIT(5)	/* no slow clock */