Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/pci whitespace
details: https://anonhg.NetBSD.org/src/rev/919309dd42a3
branches: trunk
changeset: 806333:919309dd42a3
user: nonaka <nonaka%NetBSD.org@localhost>
date: Mon Feb 16 13:22:19 2015 +0000
description:
whitespace
diffstat:
sys/dev/pci/if_iwm.c | 122 ++++++++++++++++++++++++------------------------
sys/dev/pci/if_iwmreg.h | 38 +++++++-------
sys/dev/pci/if_iwmvar.h | 14 ++--
3 files changed, 87 insertions(+), 87 deletions(-)
diffs (truncated from 484 to 300 lines):
diff -r a6dbf84cd977 -r 919309dd42a3 sys/dev/pci/if_iwm.c
--- a/sys/dev/pci/if_iwm.c Mon Feb 16 13:16:00 2015 +0000
+++ b/sys/dev/pci/if_iwm.c Mon Feb 16 13:22:19 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwm.c,v 1.7 2015/02/16 13:16:00 nonaka Exp $ */
+/* $NetBSD: if_iwm.c,v 1.8 2015/02/16 13:22:19 nonaka Exp $ */
/* OpenBSD: if_iwm.c,v 1.18 2015/02/11 01:12:42 brad Exp */
/*
@@ -105,7 +105,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.7 2015/02/16 13:16:00 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.8 2015/02/16 13:22:19 nonaka Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -222,7 +222,7 @@
static int iwm_nic_lock(struct iwm_softc *);
static void iwm_nic_unlock(struct iwm_softc *);
static void iwm_set_bits_mask_prph(struct iwm_softc *, uint32_t, uint32_t,
- uint32_t);
+ uint32_t);
static void iwm_set_bits_prph(struct iwm_softc *, uint32_t, uint32_t);
static void iwm_clear_bits_prph(struct iwm_softc *, uint32_t, uint32_t);
static int iwm_dma_contig_alloc(bus_dma_tag_t, struct iwm_dma_info *,
@@ -614,8 +614,8 @@
iwm_read_firmware(struct iwm_softc *sc)
{
struct iwm_fw_info *fw = &sc->sc_fw;
- struct iwm_tlv_ucode_header *uhdr;
- struct iwm_ucode_tlv tlv;
+ struct iwm_tlv_ucode_header *uhdr;
+ struct iwm_ucode_tlv tlv;
enum iwm_ucode_tlv_type tlv_type;
uint8_t *data;
int error, status;
@@ -1296,7 +1296,7 @@
uint32_t v;
int s;
int rv;
-
+
s = splnet();
/*
@@ -1376,7 +1376,7 @@
IWM_SETBITS(sc, IWM_CSR_HW_IF_CONFIG_REG,
IWM_CSR_HW_IF_CONFIG_REG_BIT_NIC_READY);
- return iwm_poll_bit(sc, IWM_CSR_HW_IF_CONFIG_REG,
+ return iwm_poll_bit(sc, IWM_CSR_HW_IF_CONFIG_REG,
IWM_CSR_HW_IF_CONFIG_REG_BIT_NIC_READY,
IWM_CSR_HW_IF_CONFIG_REG_BIT_NIC_READY,
IWM_HW_READY_TIMEOUT);
@@ -1556,7 +1556,7 @@
if ((error = iwm_prepare_card_hw(sc)) != 0)
return error;
- /* Reset the entire device */
+ /* Reset the entire device */
IWM_WRITE(sc, IWM_CSR_RESET,
IWM_CSR_RESET_REG_FLAG_SW_RESET |
IWM_CSR_RESET_REG_FLAG_NEVO_RESET);
@@ -1627,9 +1627,9 @@
/* Stop the device, and put it in low power state */
iwm_apm_stop(sc);
- /* Upon stop, the APM issues an interrupt if HW RF kill is set.
- * Clean again the interrupt here
- */
+ /* Upon stop, the APM issues an interrupt if HW RF kill is set.
+ * Clean again the interrupt here
+ */
iwm_disable_interrupts(sc);
/* stop and reset the on-board processor */
IWM_WRITE(sc, IWM_CSR_RESET, IWM_CSR_RESET_REG_FLAG_NEVO_RESET);
@@ -1677,8 +1677,8 @@
IWM_WRITE(sc, IWM_CSR_HW_IF_CONFIG_REG, reg_val);
- DPRINTF(("Radio type=0x%x-0x%x-0x%x\n", radio_cfg_type,
- radio_cfg_step, radio_cfg_dash));
+ DPRINTF(("Radio type=0x%x-0x%x-0x%x\n", radio_cfg_type,
+ radio_cfg_step, radio_cfg_dash));
/*
* W/A : NIC is stuck in a reset state after Early PCIe power off
@@ -1797,7 +1797,7 @@
DPRINTF(("shadow registers enabled\n"));
IWM_SETBITS(sc, IWM_CSR_MAC_SHADOW_REG_CTRL, 0x800fffff);
- return 0;
+ return 0;
}
#if 0
@@ -1810,10 +1810,10 @@
};
static const uint8_t iwm_mvm_ac_to_tx_fifo[] = {
- IWM_MVM_TX_FIFO_VO,
- IWM_MVM_TX_FIFO_VI,
- IWM_MVM_TX_FIFO_BE,
- IWM_MVM_TX_FIFO_BK,
+ IWM_MVM_TX_FIFO_VO,
+ IWM_MVM_TX_FIFO_VI,
+ IWM_MVM_TX_FIFO_BE,
+ IWM_MVM_TX_FIFO_BK,
};
#endif
@@ -1907,7 +1907,7 @@
IWM_SETBITS(sc, IWM_FH_TX_CHICKEN_BITS_REG,
IWM_FH_TX_CHICKEN_BITS_SCD_AUTO_RETRY_EN);
- /* Enable L1-Active */
+ /* Enable L1-Active */
iwm_clear_bits_prph(sc, IWM_APMG_PCIDEV_STT_REG,
IWM_APMG_PCIDEV_STT_VAL_L1_ACT_DIS);
@@ -2665,8 +2665,8 @@
*/
struct iwm_nvm_section {
- uint16_t length;
- const uint8_t *data;
+ uint16_t length;
+ const uint8_t *data;
};
#define IWM_FW_VALID_TX_ANT(sc) \
@@ -2757,7 +2757,7 @@
IWM_WRITE(sc, IWM_FH_TFDIB_CTRL0_REG(IWM_FH_SRVC_CHNL),
dma->paddr & IWM_FH_MEM_TFDIB_DRAM_ADDR_LSB_MSK);
IWM_WRITE(sc, IWM_FH_TFDIB_CTRL1_REG(IWM_FH_SRVC_CHNL),
- (iwm_get_dma_hi_addr(dma->paddr)
+ (iwm_get_dma_hi_addr(dma->paddr)
<< IWM_FH_MEM_TFDIB_REG1_ADDR_BITSHIFT) | byte_cnt);
IWM_WRITE(sc, IWM_FH_TCSR_CHNL_TX_BUF_STS_REG(IWM_FH_SRVC_CHNL),
1 << IWM_FH_TCSR_CHNL_TX_BUF_STS_REG_POS_TB_NUM |
@@ -2767,7 +2767,7 @@
IWM_FH_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_ENABLE |
IWM_FH_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_DISABLE |
IWM_FH_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_ENDTFD);
-
+
iwm_nic_unlock(sc);
/* wait 1s for this segment to load */
@@ -2775,7 +2775,7 @@
if ((error = tsleep(&sc->sc_fw, 0, "iwmfw", hz)) != 0)
break;
- return error;
+ return error;
}
static int
@@ -2897,7 +2897,7 @@
return error;
sc->sc_uc_current = ucode_type;
- error = iwm_start_fw(sc, ucode_type);
+ error = iwm_start_fw(sc, ucode_type);
if (error) {
sc->sc_uc_current = old_type;
return error;
@@ -2926,7 +2926,7 @@
}
sc->sc_init_complete = 0;
- if ((error = iwm_mvm_load_ucode_wait_alive(sc,
+ if ((error = iwm_mvm_load_ucode_wait_alive(sc,
IWM_UCODE_TYPE_INIT)) != 0)
return error;
@@ -3018,7 +3018,7 @@
data->m = m;
bus_dmamap_sync(sc->sc_dmat, data->map, 0, size, BUS_DMASYNC_PREREAD);
- /* Update RX descriptor. */
+ /* Update RX descriptor. */
ring->desc[idx] = htole32(data->map->dm_segs[0].ds_addr >> 8);
bus_dmamap_sync(sc->sc_dmat, ring->desc_dma.map,
idx * sizeof(uint32_t), sizeof(uint32_t), BUS_DMASYNC_PREWRITE);
@@ -3261,7 +3261,7 @@
}
static void
-iwm_mvm_rx_tx_cmd(struct iwm_softc *sc,
+iwm_mvm_rx_tx_cmd(struct iwm_softc *sc,
struct iwm_rx_packet *pkt, struct iwm_rx_data *data)
{
struct ieee80211com *ic = &sc->sc_ic;
@@ -3480,7 +3480,7 @@
chains_static, chains_dynamic, IWM_FW_CTXT_ACTION_MODIFY, 0);
}
-/*
+/*
* END iwlwifi/mvm/phy-ctxt.c
*/
@@ -3816,7 +3816,7 @@
} else {
tx->initial_rate_index = (nrates-1) - in->in_ni.ni_txrate;
}
- tx->tx_flags |= htole32(IWM_TX_CMD_FLG_STA_RATE);
+ tx->tx_flags |= htole32(IWM_TX_CMD_FLG_STA_RATE);
DPRINTFN(12, ("start with txrate %d\n", tx->initial_rate_index));
return &iwm_rates[tx->initial_rate_index];
}
@@ -3941,12 +3941,12 @@
tx->pm_frame_timeout = htole16(0);
}
- if (hdrlen & 3) {
- /* First segment length must be a multiple of 4. */
- flags |= IWM_TX_CMD_FLG_MH_PAD;
- pad = 4 - (hdrlen & 3);
- } else
- pad = 0;
+ if (hdrlen & 3) {
+ /* First segment length must be a multiple of 4. */
+ flags |= IWM_TX_CMD_FLG_MH_PAD;
+ pad = 4 - (hdrlen & 3);
+ } else
+ pad = 0;
tx->driver_txop = 0;
tx->next_frame_len = 0;
@@ -5180,7 +5180,7 @@
while (sc->sc_auth_prot)
tsleep(&sc->sc_auth_prot, 0, "iwmauth", 0);
sc->sc_auth_prot = 1;
-
+
duration = min(IWM_MVM_TE_SESSION_PROTECTION_MAX_TIME_MS,
200 + in->in_ni.ni_intval);
min_duration = min(IWM_MVM_TE_SESSION_PROTECTION_MIN_TIME_MS,
@@ -5334,7 +5334,7 @@
memset(&in->in_ridx, -1, sizeof(in->in_ridx));
for (i = 0; i < nrates; i++) {
int rate = ni->ni_rates.rs_rates[i] & IEEE80211_RATE_VAL;
-
+
/* Map 802.11 rate to HW rate index. */
for (ridx = 0; ridx <= IWM_RIDX_MAX; ridx++)
if (iwm_rates[ridx].rate == rate)
@@ -5489,7 +5489,7 @@
if ((error = iwm_mvm_scan_request(sc, IEEE80211_CHAN_2GHZ,
ic->ic_des_esslen != 0,
ic->ic_des_essid, ic->ic_des_esslen)) != 0) {
- DPRINTF(("%s: could not initiate scan\n", DEVNAME(sc)));
+ DPRINTF(("%s: could not initiate scan\n", DEVNAME(sc)));
return;
}
ic->ic_state = nstate;
@@ -5635,15 +5635,15 @@
goto error;
}
- if ((error = iwm_send_tx_ant_cfg(sc, IWM_FW_VALID_TX_ANT(sc))) != 0)
- goto error;
-
- /* Send phy db control command and then phy db calibration*/
- if ((error = iwm_send_phy_db_data(sc)) != 0)
- goto error;
-
- if ((error = iwm_send_phy_cfg_cmd(sc)) != 0)
- goto error;
+ if ((error = iwm_send_tx_ant_cfg(sc, IWM_FW_VALID_TX_ANT(sc))) != 0)
+ goto error;
+
+ /* Send phy db control command and then phy db calibration*/
+ if ((error = iwm_send_phy_db_data(sc)) != 0)
+ goto error;
+
+ if ((error = iwm_send_phy_cfg_cmd(sc)) != 0)
+ goto error;
/* Add auxiliary station for scanning */
if ((error = iwm_mvm_add_aux_sta(sc)) != 0)
@@ -5660,9 +5660,9 @@
goto error;
}
- error = iwm_mvm_power_update_device(sc);
- if (error)
- goto error;
+ error = iwm_mvm_power_update_device(sc);
+ if (error)
+ goto error;
/* Mark TX rings as active. */
for (qid = 0; qid < 4; qid++) {
@@ -5720,7 +5720,7 @@
struct iwm_softc *sc = ifp->if_softc;
Home |
Main Index |
Thread Index |
Old Index