d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix style: add tab after #define.

Browse Source
This commit is contained in:
Kevin Lo 2013-12-18 08:39:12 +00:00
parent c48c6bf8fc
commit fd8fcee579
3 changed files with 682 additions and 684 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/dev/usb/wlan/if_run.c
View File

@ -70,14 +70,14 @@ __FBSDID("$FreeBSD$");
#include <dev/usb/usbdi.h>
#include "usbdevs.h"
#define USB_DEBUG_VAR run_debug
#define USB_DEBUG_VAR run_debug
#include <dev/usb/usb_debug.h>
#include <dev/usb/wlan/if_runreg.h>
#include <dev/usb/wlan/if_runvar.h>
#ifdef USB_DEBUG
#define RUN_DEBUG
#define RUN_DEBUG
#endif
#ifdef RUN_DEBUG
@ -87,17 +87,17 @@ SYSCTL_INT(_hw_usb_run, OID_AUTO, debug, CTLFLAG_RW, &run_debug, 0,
"run debug level");
#endif
#define IEEE80211_HAS_ADDR4(wh) \
#define IEEE80211_HAS_ADDR4(wh) \
(((wh)->i_fc[1] & IEEE80211_FC1_DIR_MASK) == IEEE80211_FC1_DIR_DSTODS)
/*
* Because of LOR in run_key_delete(), use atomic instead.
* '& RUN_CMDQ_MASQ' is to loop cmdq[].
*/
#define RUN_CMDQ_GET(c) (atomic_fetchadd_32((c), 1) & RUN_CMDQ_MASQ)
#define RUN_CMDQ_GET(c) (atomic_fetchadd_32((c), 1) & RUN_CMDQ_MASQ)
static const STRUCT_USB_HOST_ID run_devs[] = {
#define RUN_DEV(v,p) { USB_VP(USB_VENDOR_##v, USB_PRODUCT_##v##_##p) }
#define RUN_DEV(v,p) { USB_VP(USB_VENDOR_##v, USB_PRODUCT_##v##_##p) }
RUN_DEV(ABOCOM, RT2770),
RUN_DEV(ABOCOM, RT2870),
RUN_DEV(ABOCOM, RT3070),
@ -4772,8 +4772,8 @@ run_enable_tsf_sync(struct run_softc *sc)
static void
run_enable_mrr(struct run_softc *sc)
{
#define CCK(mcs) (mcs)
#define OFDM(mcs) (1 << 3 | (mcs))
#define CCK(mcs) (mcs)
#define OFDM(mcs) (1 << 3 | (mcs))
run_write(sc, RT2860_LG_FBK_CFG0,
OFDM(6) << 28 | /* 54->48 */
OFDM(5) << 24 | /* 48->36 */

1314
sys/dev/usb/wlan/if_runreg.h
View File

File diff suppressed because it is too large Load Diff

38
sys/dev/usb/wlan/if_runvar.h
View File

@ -23,25 +23,25 @@
#ifndef _IF_RUNVAR_H_
#define _IF_RUNVAR_H_
#define RUN_MAX_RXSZ \
#define RUN_MAX_RXSZ \
MIN(4096, MJUMPAGESIZE)
/* NB: "11" is the maximum number of padding bytes needed for Tx */
#define RUN_MAX_TXSZ \
#define RUN_MAX_TXSZ \
(sizeof (struct rt2870_txd) + \
sizeof (struct rt2860_txwi) + \
MCLBYTES + 11)
#define RUN_TX_TIMEOUT 5000 /* ms */
#define RUN_TX_TIMEOUT 5000 /* ms */
/* Tx ring count was 8/endpoint, now 32 for all 4 (or 6) endpoints. */
#define RUN_TX_RING_COUNT 32
#define RUN_RX_RING_COUNT 1
#define RUN_TX_RING_COUNT 32
#define RUN_RX_RING_COUNT 1
#define RT2870_WCID_MAX 64
#define RUN_AID2WCID(aid) ((aid) & 0xff)
#define RT2870_WCID_MAX 64
#define RUN_AID2WCID(aid) ((aid) & 0xff)
#define RUN_VAP_MAX 8
#define RUN_VAP_MAX 8
struct run_rx_radiotap_header {
struct ieee80211_radiotap_header wr_ihdr;
@ -54,7 +54,7 @@ struct run_rx_radiotap_header {
uint8_t wr_antsignal;
} __packed __aligned(8);
#define RUN_RX_RADIOTAP_PRESENT \
#define RUN_RX_RADIOTAP_PRESENT \
(1 << IEEE80211_RADIOTAP_FLAGS | \
1 << IEEE80211_RADIOTAP_RATE | \
1 << IEEE80211_RADIOTAP_CHANNEL | \
@ -73,7 +73,7 @@ struct run_tx_radiotap_header {
#define IEEE80211_RADIOTAP_HWQUEUE 15
#define RUN_TX_RADIOTAP_PRESENT \
#define RUN_TX_RADIOTAP_PRESENT \
(1 << IEEE80211_RADIOTAP_FLAGS | \
1 << IEEE80211_RADIOTAP_RATE | \
1 << IEEE80211_RADIOTAP_CHANNEL | \
@ -122,7 +122,7 @@ struct run_vap {
uint8_t rvp_id;
};
#define RUN_VAP(vap) ((struct run_vap *)(vap))
#define RUN_VAP(vap) ((struct run_vap *)(vap))
/*
* There are 7 bulk endpoints: 1 for RX
@ -206,19 +206,19 @@ struct run_softc {
struct task ratectl_task;
struct usb_callout ratectl_ch;
uint8_t ratectl_run;
#define RUN_RATECTL_OFF 0
#define RUN_RATECTL_OFF 0
/* need to be power of 2, otherwise RUN_CMDQ_GET fails */
#define RUN_CMDQ_MAX 16
#define RUN_CMDQ_MASQ (RUN_CMDQ_MAX - 1)
#define RUN_CMDQ_MAX 16
#define RUN_CMDQ_MASQ (RUN_CMDQ_MAX - 1)
struct run_cmdq cmdq[RUN_CMDQ_MAX];
struct task cmdq_task;
uint32_t cmdq_store;
uint8_t cmdq_exec;
uint8_t cmdq_run;
uint8_t cmdq_key_set;
#define RUN_CMDQ_ABORT 0
#define RUN_CMDQ_GO 1
#define RUN_CMDQ_ABORT 0
#define RUN_CMDQ_GO 1
struct usb_xfer *sc_xfer[RUN_N_XFER];
@ -250,8 +250,8 @@ struct run_softc {
int sc_txtap_len;
};
#define RUN_LOCK(sc) mtx_lock(&(sc)->sc_mtx)
#define RUN_UNLOCK(sc) mtx_unlock(&(sc)->sc_mtx)
#define RUN_LOCK_ASSERT(sc, t) mtx_assert(&(sc)->sc_mtx, t)
#define RUN_LOCK(sc) mtx_lock(&(sc)->sc_mtx)
#define RUN_UNLOCK(sc) mtx_unlock(&(sc)->sc_mtx)
#define RUN_LOCK_ASSERT(sc, t) mtx_assert(&(sc)->sc_mtx, t)
#endif /* _IF_RUNVAR_H_ */