mirrors/madwifi
1
0
Fork 0
mirror of https://github.com/proski/madwifi synced 2024-11-22 06:21:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix opening brace placement in functions

Browse Source 
git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@3799 0192ed92-7a03-0410-a25b-9323aeb14dbd
This commit is contained in:
proski 2008-07-17 07:29:42 +00:00
parent c280829aed
commit 49943c6614
2 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
ath/if_ath.c
View File

@ -1569,7 +1569,8 @@ ath_resume(struct net_device *dev)
* NB: This helper function basically clobbers all the related registers * NB: This helper function basically clobbers all the related registers
* if we have disabled int. mit. cap, allowing us to turn it on and off and * if we have disabled int. mit. cap, allowing us to turn it on and off and
* work around the bug preventing it from being disabled. */ * work around the bug preventing it from being disabled. */
static inline void ath_override_intmit_if_disabled(struct ath_softc *sc) { static inline void ath_override_intmit_if_disabled(struct ath_softc *sc)
{
/* Restore int. mit. registers if they were turned off. */ /* Restore int. mit. registers if they were turned off. */
if (sc->sc_hasintmit && !sc->sc_useintmit) if (sc->sc_hasintmit && !sc->sc_useintmit)
ath_hal_restore_default_intmit(sc->sc_ah); ath_hal_restore_default_intmit(sc->sc_ah);
@ -1689,14 +1690,16 @@ static HAL_BOOL ath_hw_reset(struct ath_softc *sc, HAL_OPMODE opmode,
/* Channel Availability Check is running, or a channel has already found to be /* Channel Availability Check is running, or a channel has already found to be
* unavailable. */ * unavailable. */
static int static int
ath_chan_unavail(struct ath_softc *sc) { ath_chan_unavail(struct ath_softc *sc)
{
return sc->sc_dfs_cac || return sc->sc_dfs_cac ||
((sc->sc_curchan.privFlags & CHANNEL_DFS) && ((sc->sc_curchan.privFlags & CHANNEL_DFS) &&
(sc->sc_curchan.privFlags & CHANNEL_INTERFERENCE)); (sc->sc_curchan.privFlags & CHANNEL_INTERFERENCE));
} }
static inline int static inline int
_ath_cac_running_dbgmsg(struct ath_softc *sc, const char *func) { _ath_cac_running_dbgmsg(struct ath_softc *sc, const char *func)
{
int b = sc->sc_dfs_cac; int b = sc->sc_dfs_cac;
if (b) if (b)
DPRINTF(sc, ATH_DEBUG_DOTH, DPRINTF(sc, ATH_DEBUG_DOTH,
@ -1706,7 +1709,8 @@ _ath_cac_running_dbgmsg(struct ath_softc *sc, const char *func) {
} }
static inline int static inline int
_ath_chan_unavail_dbgmsg(struct ath_softc *sc, const char *func) { _ath_chan_unavail_dbgmsg(struct ath_softc *sc, const char *func)
{
int b = ath_chan_unavail(sc); int b = ath_chan_unavail(sc);
if (b) if (b)
DPRINTF(sc, ATH_DEBUG_DOTH, DPRINTF(sc, ATH_DEBUG_DOTH,
@ -1743,7 +1747,8 @@ ath_extend_tsf(u_int64_t tsf, u_int32_t rstamp)
/* Swap transmit descriptor pointer for HW. */ /* Swap transmit descriptor pointer for HW. */
static __inline u_int32_t static __inline u_int32_t
ath_ds_link_swap(u_int32_t dp) { ath_ds_link_swap(u_int32_t dp)
{
#ifdef AH_NEED_DESC_SWAP #ifdef AH_NEED_DESC_SWAP
return swab32(dp); return swab32(dp);
#else #else
@ -1752,7 +1757,8 @@ ath_ds_link_swap(u_int32_t dp) {
} }
static __inline u_int32_t static __inline u_int32_t
ath_get_last_ds_link(struct ath_txq *txq) { ath_get_last_ds_link(struct ath_txq *txq)
{
struct ath_desc *ds = ath_txq_last_desc(txq); struct ath_desc *ds = ath_txq_last_desc(txq);
return (ds ? ds->ds_link : 0); return (ds ? ds->ds_link : 0);
} }
@ -3197,10 +3203,11 @@ static
struct ath_buf * struct ath_buf *
#ifdef IEEE80211_DEBUG_REFCNT #ifdef IEEE80211_DEBUG_REFCNT
_take_txbuf_debug(struct ath_softc *sc, int for_management, _take_txbuf_debug(struct ath_softc *sc, int for_management,
const char *func, int line) { const char *func, int line)
#else #else
_take_txbuf(struct ath_softc *sc, int for_management) { _take_txbuf(struct ath_softc *sc, int for_management)
#endif /* #ifdef IEEE80211_DEBUG_REFCNT */ #endif /* #ifdef IEEE80211_DEBUG_REFCNT */
{
struct ath_buf *bf = NULL; struct ath_buf *bf = NULL;
ATH_TXBUF_LOCK_IRQ(sc); ATH_TXBUF_LOCK_IRQ(sc);
#ifdef IEEE80211_DEBUG_REFCNT #ifdef IEEE80211_DEBUG_REFCNT
@ -4276,17 +4283,20 @@ ath_default_ctsack_timeout(struct ath_softc *sc)
} }
static inline int static inline int
ath_getslottime(struct ath_softc *sc) { ath_getslottime(struct ath_softc *sc)
{
return ath_hal_getslottime(sc->sc_ah); return ath_hal_getslottime(sc->sc_ah);
} }
static inline int static inline int
ath_getacktimeout(struct ath_softc *sc) { ath_getacktimeout(struct ath_softc *sc)
{
return ath_hal_getacktimeout(sc->sc_ah); return ath_hal_getacktimeout(sc->sc_ah);
} }
static inline int static inline int
ath_getctstimeout(struct ath_softc *sc) { ath_getctstimeout(struct ath_softc *sc)
{
return ath_hal_getctstimeout(sc->sc_ah); return ath_hal_getctstimeout(sc->sc_ah);
} }
@ -6114,7 +6124,8 @@ ath_alloc_skb(u_int size, u_int align)
} }
static struct sk_buff * static struct sk_buff *
ath_rxbuf_take_skb(struct ath_softc *sc, struct ath_buf *bf) { ath_rxbuf_take_skb(struct ath_softc *sc, struct ath_buf *bf)
{
struct sk_buff *skb = bf->bf_skb; struct sk_buff *skb = bf->bf_skb;
bf->bf_skb = NULL; bf->bf_skb = NULL;
KASSERT(bf->bf_skbaddr, ("bf->bf_skbaddr is 0")); KASSERT(bf->bf_skbaddr, ("bf->bf_skbaddr is 0"));
@ -11943,7 +11954,8 @@ ath_interrupt_dfs_cac(struct ath_softc *sc, const char *reason)
* implementing AP requested mute tests in station mode later. */ * implementing AP requested mute tests in station mode later. */
void void
ath_radar_detected(struct ath_softc *sc, const char *cause) { ath_radar_detected(struct ath_softc *sc, const char *cause)
{
struct ath_hal *ah = sc->sc_ah; struct ath_hal *ah = sc->sc_ah;
struct ieee80211com *ic = &sc->sc_ic; struct ieee80211com *ic = &sc->sc_ic;
struct ieee80211_channel ichan; struct ieee80211_channel ichan;
@ -12031,7 +12043,8 @@ ath_rcv_dev_event(struct notifier_block *this, unsigned long event,
* exlucded, and AH_FALSE otherwise. */ * exlucded, and AH_FALSE otherwise. */
#ifdef ATH_REVERSE_ENGINEERING #ifdef ATH_REVERSE_ENGINEERING
static HAL_BOOL static HAL_BOOL
ath_regdump_filter(struct ath_softc *sc, u_int32_t address) { ath_regdump_filter(struct ath_softc *sc, u_int32_t address)
{
#ifndef ATH_REVERSE_ENGINEERING_WITH_NO_FEAR #ifndef ATH_REVERSE_ENGINEERING_WITH_NO_FEAR
char buf[MAX_REGISTER_NAME_LEN]; char buf[MAX_REGISTER_NAME_LEN];
#endif #endif
@ -12064,7 +12077,8 @@ ath_regdump_filter(struct ath_softc *sc, u_int32_t address) {
/* Dump any Atheros registers we think might be interesting. */ /* Dump any Atheros registers we think might be interesting. */
#ifdef ATH_REVERSE_ENGINEERING #ifdef ATH_REVERSE_ENGINEERING
static void static void
ath_ar5212_registers_dump(struct ath_softc *sc) { ath_ar5212_registers_dump(struct ath_softc *sc)
{
unsigned int address = MIN_REGISTER_ADDRESS; unsigned int address = MIN_REGISTER_ADDRESS;
unsigned int value = 0; unsigned int value = 0;
@ -12354,13 +12368,15 @@ cleanup_ath_buf(struct ath_softc *sc, struct ath_buf *bf, int direction)
#define SCANTXBUF_NAMSIZ 64 #define SCANTXBUF_NAMSIZ 64
static inline int static inline int
descdma_contains_buffer(struct ath_descdma *dd, struct ath_buf *bf) { descdma_contains_buffer(struct ath_descdma *dd, struct ath_buf *bf)
{
return (bf >= (dd->dd_bufptr)) && return (bf >= (dd->dd_bufptr)) &&
bf < (dd->dd_bufptr + dd->dd_nbuf); bf < (dd->dd_bufptr + dd->dd_nbuf);
} }
static inline int static inline int
descdma_index_of_buffer(struct ath_descdma *dd, struct ath_buf *bf) { descdma_index_of_buffer(struct ath_descdma *dd, struct ath_buf *bf)
{
if (!descdma_contains_buffer(dd, bf)) if (!descdma_contains_buffer(dd, bf))
return -1; return -1;
return bf - dd->dd_bufptr; return bf - dd->dd_bufptr;

6
ath/if_ath_radar.c
View File

@ -363,7 +363,8 @@ static struct ath_rp *pulse_prev(struct ath_rp *pulse)
#define MR_FAIL_MAX_PERIOD 5 #define MR_FAIL_MAX_PERIOD 5
#ifdef AR_DEBUG #ifdef AR_DEBUG
static const char *get_match_result_desc(u_int32_t code) { static const char *get_match_result_desc(u_int32_t code)
{
switch (code) { switch (code) {
case MR_MATCH: case MR_MATCH:
return "MATCH"; return "MATCH";
@ -1226,7 +1227,8 @@ static u_int32_t interval_to_frequency(u_int32_t interval)
#endif /* AR_DEBUG */ #endif /* AR_DEBUG */
#ifdef ATH_RADAR_LONG_PULSE #ifdef ATH_RADAR_LONG_PULSE
static const char *get_longpulse_desc(int lp) { static const char *get_longpulse_desc(int lp)
{
switch (lp) { switch (lp) {
case 8: return "FCC [5, 8 pulses]"; case 8: return "FCC [5, 8 pulses]";
case 9: return "FCC [5, 9 pulses]"; case 9: return "FCC [5, 9 pulses]";