Deleted Added
full compact
if_ath.c (251487) if_ath.c (251655)
1/*-
2 * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 14 unchanged lines hidden (view full) ---

23 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
24 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
25 * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
26 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
27 * THE POSSIBILITY OF SUCH DAMAGES.
28 */
29
30#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 14 unchanged lines hidden (view full) ---

23 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
24 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
25 * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
26 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
27 * THE POSSIBILITY OF SUCH DAMAGES.
28 */
29
30#include <sys/cdefs.h>
31__FBSDID("$FreeBSD: head/sys/dev/ath/if_ath.c 251487 2013-06-07 09:02:02Z adrian $");
31__FBSDID("$FreeBSD: head/sys/dev/ath/if_ath.c 251655 2013-06-12 14:52:57Z adrian $");
32
33/*
34 * Driver for the Atheros Wireless LAN controller.
35 *
36 * This software is derived from work of Atsushi Onoe; his contribution
37 * is greatly appreciated.
38 */
39

--- 68 unchanged lines hidden (view full) ---

108#include <dev/ath/if_ath_led.h>
109#include <dev/ath/if_ath_keycache.h>
110#include <dev/ath/if_ath_rx.h>
111#include <dev/ath/if_ath_rx_edma.h>
112#include <dev/ath/if_ath_tx_edma.h>
113#include <dev/ath/if_ath_beacon.h>
114#include <dev/ath/if_ath_btcoex.h>
115#include <dev/ath/if_ath_spectral.h>
32
33/*
34 * Driver for the Atheros Wireless LAN controller.
35 *
36 * This software is derived from work of Atsushi Onoe; his contribution
37 * is greatly appreciated.
38 */
39

--- 68 unchanged lines hidden (view full) ---

108#include <dev/ath/if_ath_led.h>
109#include <dev/ath/if_ath_keycache.h>
110#include <dev/ath/if_ath_rx.h>
111#include <dev/ath/if_ath_rx_edma.h>
112#include <dev/ath/if_ath_tx_edma.h>
113#include <dev/ath/if_ath_beacon.h>
114#include <dev/ath/if_ath_btcoex.h>
115#include <dev/ath/if_ath_spectral.h>
116#include <dev/ath/if_ath_lna_div.h>
116#include <dev/ath/if_athdfs.h>
117
118#ifdef ATH_TX99_DIAG
119#include <dev/ath/ath_tx99/ath_tx99.h>
120#endif
121
122#ifdef ATH_DEBUG_ALQ
123#include <dev/ath/if_ath_alq.h>

--- 401 unchanged lines hidden (view full) ---

525 /* Attach bluetooth coexistence module */
526 if (ath_btcoex_attach(sc) < 0) {
527 device_printf(sc->sc_dev,
528 "%s: unable to attach bluetooth coexistence\n", __func__);
529 error = EIO;
530 goto bad2;
531 }
532
117#include <dev/ath/if_athdfs.h>
118
119#ifdef ATH_TX99_DIAG
120#include <dev/ath/ath_tx99/ath_tx99.h>
121#endif
122
123#ifdef ATH_DEBUG_ALQ
124#include <dev/ath/if_ath_alq.h>

--- 401 unchanged lines hidden (view full) ---

526 /* Attach bluetooth coexistence module */
527 if (ath_btcoex_attach(sc) < 0) {
528 device_printf(sc->sc_dev,
529 "%s: unable to attach bluetooth coexistence\n", __func__);
530 error = EIO;
531 goto bad2;
532 }
533
534 /* Attach LNA diversity module */
535 if (ath_lna_div_attach(sc) < 0) {
536 device_printf(sc->sc_dev,
537 "%s: unable to attach LNA diversity\n", __func__);
538 error = EIO;
539 goto bad2;
540 }
541
533 /* Start DFS processing tasklet */
534 TASK_INIT(&sc->sc_dfstask, 0, ath_dfs_tasklet, sc);
535
536 /* Configure LED state */
537 sc->sc_blinking = 0;
538 sc->sc_ledstate = 1;
539 sc->sc_ledon = 0; /* low true */
540 sc->sc_ledidle = (2700*hz)/1000; /* 2.7sec */

--- 134 unchanged lines hidden (view full) ---

675 ic->ic_caps |= IEEE80211_C_BURST;
676 sc->sc_hasbmask = ath_hal_hasbssidmask(ah);
677 sc->sc_hasbmatch = ath_hal_hasbssidmatch(ah);
678 sc->sc_hastsfadd = ath_hal_hastsfadjust(ah);
679 sc->sc_rxslink = ath_hal_self_linked_final_rxdesc(ah);
680 sc->sc_rxtsf32 = ath_hal_has_long_rxdesc_tsf(ah);
681 sc->sc_hasenforcetxop = ath_hal_hasenforcetxop(ah);
682 sc->sc_rx_lnamixer = ath_hal_hasrxlnamixer(ah);
542 /* Start DFS processing tasklet */
543 TASK_INIT(&sc->sc_dfstask, 0, ath_dfs_tasklet, sc);
544
545 /* Configure LED state */
546 sc->sc_blinking = 0;
547 sc->sc_ledstate = 1;
548 sc->sc_ledon = 0; /* low true */
549 sc->sc_ledidle = (2700*hz)/1000; /* 2.7sec */

--- 134 unchanged lines hidden (view full) ---

684 ic->ic_caps |= IEEE80211_C_BURST;
685 sc->sc_hasbmask = ath_hal_hasbssidmask(ah);
686 sc->sc_hasbmatch = ath_hal_hasbssidmatch(ah);
687 sc->sc_hastsfadd = ath_hal_hastsfadjust(ah);
688 sc->sc_rxslink = ath_hal_self_linked_final_rxdesc(ah);
689 sc->sc_rxtsf32 = ath_hal_has_long_rxdesc_tsf(ah);
690 sc->sc_hasenforcetxop = ath_hal_hasenforcetxop(ah);
691 sc->sc_rx_lnamixer = ath_hal_hasrxlnamixer(ah);
692 sc->sc_hasdivcomb = ath_hal_hasdivantcomb(ah);
693
683 if (ath_hal_hasfastframes(ah))
684 ic->ic_caps |= IEEE80211_C_FF;
685 wmodes = ath_hal_getwirelessmodes(ah);
686 if (wmodes & (HAL_MODE_108G|HAL_MODE_TURBO))
687 ic->ic_caps |= IEEE80211_C_TURBOP;
688#ifdef IEEE80211_SUPPORT_TDMA
689 if (ath_hal_macversion(ah) > 0x78) {
690 ic->ic_caps |= IEEE80211_C_TDMA; /* capable of TDMA */

--- 342 unchanged lines hidden (view full) ---

1033#ifdef ATH_TX99_DIAG
1034 if (sc->sc_tx99 != NULL)
1035 sc->sc_tx99->detach(sc->sc_tx99);
1036#endif
1037 ath_rate_detach(sc->sc_rc);
1038#ifdef ATH_DEBUG_ALQ
1039 if_ath_alq_tidyup(&sc->sc_alq);
1040#endif
694 if (ath_hal_hasfastframes(ah))
695 ic->ic_caps |= IEEE80211_C_FF;
696 wmodes = ath_hal_getwirelessmodes(ah);
697 if (wmodes & (HAL_MODE_108G|HAL_MODE_TURBO))
698 ic->ic_caps |= IEEE80211_C_TURBOP;
699#ifdef IEEE80211_SUPPORT_TDMA
700 if (ath_hal_macversion(ah) > 0x78) {
701 ic->ic_caps |= IEEE80211_C_TDMA; /* capable of TDMA */

--- 342 unchanged lines hidden (view full) ---

1044#ifdef ATH_TX99_DIAG
1045 if (sc->sc_tx99 != NULL)
1046 sc->sc_tx99->detach(sc->sc_tx99);
1047#endif
1048 ath_rate_detach(sc->sc_rc);
1049#ifdef ATH_DEBUG_ALQ
1050 if_ath_alq_tidyup(&sc->sc_alq);
1051#endif
1052 ath_lna_div_detach(sc);
1041 ath_btcoex_detach(sc);
1042 ath_spectral_detach(sc);
1043 ath_dfs_detach(sc);
1044 ath_desc_free(sc);
1045 ath_txdma_teardown(sc);
1046 ath_rxdma_teardown(sc);
1047 ath_tx_cleanup(sc);
1048 ath_hal_detach(sc->sc_ah); /* NB: sets chip in full sleep */

--- 5464 unchanged lines hidden ---
1053 ath_btcoex_detach(sc);
1054 ath_spectral_detach(sc);
1055 ath_dfs_detach(sc);
1056 ath_desc_free(sc);
1057 ath_txdma_teardown(sc);
1058 ath_rxdma_teardown(sc);
1059 ath_tx_cleanup(sc);
1060 ath_hal_detach(sc->sc_ah); /* NB: sets chip in full sleep */

--- 5464 unchanged lines hidden ---