Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 11 Oct 2007 09:49:03 GMT
From:      Kevin Lo <kevlo@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 127382 for review
Message-ID:  <200710110949.l9B9n3qU008953@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 */



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200710110949.l9B9n3qU008953>