| ah.c (189713) | ah.c (191022) |
|---|---|
| 1/* 2 * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting 3 * Copyright (c) 2002-2008 Atheros Communications, Inc. 4 * 5 * Permission to use, copy, modify, and/or distribute this software for any 6 * purpose with or without fee is hereby granted, provided that the above 7 * copyright notice and this permission notice appear in all copies. 8 * 9 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES 10 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF 11 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR 12 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 13 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 14 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 15 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 16 * | 1/* 2 * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting 3 * Copyright (c) 2002-2008 Atheros Communications, Inc. 4 * 5 * Permission to use, copy, modify, and/or distribute this software for any 6 * purpose with or without fee is hereby granted, provided that the above 7 * copyright notice and this permission notice appear in all copies. 8 * 9 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES 10 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF 11 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR 12 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 13 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 14 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 15 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 16 * |
| 17 * $FreeBSD: head/sys/dev/ath/ath_hal/ah.c 189713 2009-03-12 00:09:29Z sam $ | 17 * $FreeBSD: head/sys/dev/ath/ath_hal/ah.c 191022 2009-04-13 21:01:08Z sam $ |
| 18 */ 19#include "opt_ah.h" 20 21#include "ah.h" 22#include "ah_internal.h" 23#include "ah_devid.h" 24 25#include "ar5416/ar5416reg.h" /* NB: includes ar5212reg.h */ --- 256 unchanged lines hidden (view full) --- 282 283 numBits = OFDM_QUARTER_PLCP_BITS + (frameLen << 3); 284 numSymbols = howmany(numBits, bitsPerSymbol); 285 txTime = OFDM_QUARTER_SIFS_TIME 286 + OFDM_QUARTER_PREAMBLE_TIME 287 + (numSymbols * OFDM_QUARTER_SYMBOL_TIME); 288 break; 289 case IEEE80211_T_TURBO: | 18 */ 19#include "opt_ah.h" 20 21#include "ah.h" 22#include "ah_internal.h" 23#include "ah_devid.h" 24 25#include "ar5416/ar5416reg.h" /* NB: includes ar5212reg.h */ --- 256 unchanged lines hidden (view full) --- 282 283 numBits = OFDM_QUARTER_PLCP_BITS + (frameLen << 3); 284 numSymbols = howmany(numBits, bitsPerSymbol); 285 txTime = OFDM_QUARTER_SIFS_TIME 286 + OFDM_QUARTER_PREAMBLE_TIME 287 + (numSymbols * OFDM_QUARTER_SYMBOL_TIME); 288 break; 289 case IEEE80211_T_TURBO: |
| 290 /* we still save OFDM rates in kbps - so double them */ 291 bitsPerSymbol = ((kbps << 1) * TURBO_SYMBOL_TIME) / 1000; | 290 bitsPerSymbol = (kbps * TURBO_SYMBOL_TIME) / 1000; |
| 292 HALASSERT(bitsPerSymbol != 0); 293 294 numBits = TURBO_PLCP_BITS + (frameLen << 3); 295 numSymbols = howmany(numBits, bitsPerSymbol); 296 txTime = TURBO_SIFS_TIME 297 + TURBO_PREAMBLE_TIME 298 + (numSymbols * TURBO_SYMBOL_TIME); 299 break; --- 578 unchanged lines hidden --- | 291 HALASSERT(bitsPerSymbol != 0); 292 293 numBits = TURBO_PLCP_BITS + (frameLen << 3); 294 numSymbols = howmany(numBits, bitsPerSymbol); 295 txTime = TURBO_SIFS_TIME 296 + TURBO_PREAMBLE_TIME 297 + (numSymbols * TURBO_SYMBOL_TIME); 298 break; --- 578 unchanged lines hidden --- |