Sun Oct 9 14:40:47 2016 UTC ()
PR/51540: Henning Petersen: replace , with ;


(christos)
diff -r1.4 -r1.5 src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_attach.c
cvs diff -r1.4 -r1.5 src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_attach.c (expand / switch to unified diff)

--- src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_attach.c 2011/03/07 11:25:44 1.4
+++ src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_attach.c 2016/10/09 14:40:47 1.5
@@ -4,27 +4,27 @@ @@ -4,27 +4,27 @@
4 * 4 *
5 * Permission to use, copy, modify, and/or distribute this software for any 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 6 * purpose with or without fee is hereby granted, provided that the above
7 * copyright notice and this permission notice appear in all copies. 7 * copyright notice and this permission notice appear in all copies.
8 * 8 *
9 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES 9 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF 10 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR 11 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 12 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 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 14 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 15 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 * 16 *
17 * $Id: ar5416_attach.c,v 1.4 2011/03/07 11:25:44 cegger Exp $ 17 * $Id: ar5416_attach.c,v 1.5 2016/10/09 14:40:47 christos Exp $
18 */ 18 */
19#include "opt_ah.h" 19#include "opt_ah.h"
20 20
21#include "ah.h" 21#include "ah.h"
22#include "ah_internal.h" 22#include "ah_internal.h"
23#include "ah_devid.h" 23#include "ah_devid.h"
24 24
25#include "ah_eeprom_v14.h" 25#include "ah_eeprom_v14.h"
26 26
27#include "ar5416/ar5416.h" 27#include "ar5416/ar5416.h"
28#include "ar5416/ar5416reg.h" 28#include "ar5416/ar5416reg.h"
29#include "ar5416/ar5416phy.h" 29#include "ar5416/ar5416phy.h"
30 30
@@ -76,46 +76,46 @@ ar5416InitState(struct ath_hal_5416 *ahp @@ -76,46 +76,46 @@ ar5416InitState(struct ath_hal_5416 *ahp
76 ah = &ahp->ah_priv.h; 76 ah = &ahp->ah_priv.h;
77 77
78 /* override 5212 methods for our needs */ 78 /* override 5212 methods for our needs */
79 ah->ah_magic = AR5416_MAGIC; 79 ah->ah_magic = AR5416_MAGIC;
80 ah->ah_getRateTable = ar5416GetRateTable; 80 ah->ah_getRateTable = ar5416GetRateTable;
81 ah->ah_detach = ar5416Detach; 81 ah->ah_detach = ar5416Detach;
82 82
83 /* Reset functions */ 83 /* Reset functions */
84 ah->ah_reset = ar5416Reset; 84 ah->ah_reset = ar5416Reset;
85 ah->ah_phyDisable = ar5416PhyDisable; 85 ah->ah_phyDisable = ar5416PhyDisable;
86 ah->ah_disable = ar5416Disable; 86 ah->ah_disable = ar5416Disable;
87 ah->ah_configPCIE = ar5416ConfigPCIE; 87 ah->ah_configPCIE = ar5416ConfigPCIE;
88 ah->ah_perCalibration = ar5416PerCalibration; 88 ah->ah_perCalibration = ar5416PerCalibration;
89 ah->ah_perCalibrationN = ar5416PerCalibrationN, 89 ah->ah_perCalibrationN = ar5416PerCalibrationN;
90 ah->ah_resetCalValid = ar5416ResetCalValid, 90 ah->ah_resetCalValid = ar5416ResetCalValid;
91 ah->ah_setTxPowerLimit = ar5416SetTxPowerLimit; 91 ah->ah_setTxPowerLimit = ar5416SetTxPowerLimit;
92 ah->ah_setTxPower = ar5416SetTransmitPower; 92 ah->ah_setTxPower = ar5416SetTransmitPower;
93 ah->ah_setBoardValues = ar5416SetBoardValues; 93 ah->ah_setBoardValues = ar5416SetBoardValues;
94 94
95 /* Transmit functions */ 95 /* Transmit functions */
96 ah->ah_stopTxDma = ar5416StopTxDma; 96 ah->ah_stopTxDma = ar5416StopTxDma;
97 ah->ah_setupTxDesc = ar5416SetupTxDesc; 97 ah->ah_setupTxDesc = ar5416SetupTxDesc;
98 ah->ah_setupXTxDesc = ar5416SetupXTxDesc; 98 ah->ah_setupXTxDesc = ar5416SetupXTxDesc;
99 ah->ah_fillTxDesc = ar5416FillTxDesc; 99 ah->ah_fillTxDesc = ar5416FillTxDesc;
100 ah->ah_procTxDesc = ar5416ProcTxDesc; 100 ah->ah_procTxDesc = ar5416ProcTxDesc;
101 101
102 /* Receive Functions */ 102 /* Receive Functions */
103 ah->ah_startPcuReceive = ar5416StartPcuReceive; 103 ah->ah_startPcuReceive = ar5416StartPcuReceive;
104 ah->ah_stopPcuReceive = ar5416StopPcuReceive; 104 ah->ah_stopPcuReceive = ar5416StopPcuReceive;
105 ah->ah_setupRxDesc = ar5416SetupRxDesc; 105 ah->ah_setupRxDesc = ar5416SetupRxDesc;
106 ah->ah_procRxDesc = ar5416ProcRxDesc; 106 ah->ah_procRxDesc = ar5416ProcRxDesc;
107 ah->ah_rxMonitor = ar5416AniPoll, 107 ah->ah_rxMonitor = ar5416AniPoll;
108 ah->ah_procMibEvent = ar5416ProcessMibIntr, 108 ah->ah_procMibEvent = ar5416ProcessMibIntr;
109 109
110 /* Misc Functions */ 110 /* Misc Functions */
111 ah->ah_getDiagState = ar5416GetDiagState; 111 ah->ah_getDiagState = ar5416GetDiagState;
112 ah->ah_setLedState = ar5416SetLedState; 112 ah->ah_setLedState = ar5416SetLedState;
113 ah->ah_gpioCfgOutput = ar5416GpioCfgOutput; 113 ah->ah_gpioCfgOutput = ar5416GpioCfgOutput;
114 ah->ah_gpioCfgInput = ar5416GpioCfgInput; 114 ah->ah_gpioCfgInput = ar5416GpioCfgInput;
115 ah->ah_gpioGet = ar5416GpioGet; 115 ah->ah_gpioGet = ar5416GpioGet;
116 ah->ah_gpioSet = ar5416GpioSet; 116 ah->ah_gpioSet = ar5416GpioSet;
117 ah->ah_gpioSetIntr = ar5416GpioSetIntr; 117 ah->ah_gpioSetIntr = ar5416GpioSetIntr;
118 ah->ah_resetTsf = ar5416ResetTsf; 118 ah->ah_resetTsf = ar5416ResetTsf;
119 ah->ah_getRfGain = ar5416GetRfgain; 119 ah->ah_getRfGain = ar5416GetRfgain;
120 ah->ah_setAntennaSwitch = ar5416SetAntennaSwitch; 120 ah->ah_setAntennaSwitch = ar5416SetAntennaSwitch;
121 ah->ah_setDecompMask = ar5416SetDecompMask; 121 ah->ah_setDecompMask = ar5416SetDecompMask;