Deleted Added
full compact
if_wpivar.h (278366) if_wpivar.h (280059)
1/* $FreeBSD: head/sys/dev/wpi/if_wpivar.h 278366 2015-02-07 23:11:38Z adrian $ */
1/* $FreeBSD: head/sys/dev/wpi/if_wpivar.h 280059 2015-03-15 20:19:54Z adrian $ */
2
3/*-
4 * Copyright (c) 2006,2007
5 * Damien Bergamini <damien.bergamini@free.fr>
6 *
7 * Permission to use, copy, modify, and distribute this software for any
8 * purpose with or without fee is hereby granted, provided that the above
9 * copyright notice and this permission notice appear in all copies.

--- 37 unchanged lines hidden (view full) ---

47
48#define WPI_TX_RADIOTAP_PRESENT \
49 ((1 << IEEE80211_RADIOTAP_FLAGS) | \
50 (1 << IEEE80211_RADIOTAP_RATE) | \
51 (1 << IEEE80211_RADIOTAP_CHANNEL))
52
53struct wpi_dma_info {
54 bus_dma_tag_t tag;
2
3/*-
4 * Copyright (c) 2006,2007
5 * Damien Bergamini <damien.bergamini@free.fr>
6 *
7 * Permission to use, copy, modify, and distribute this software for any
8 * purpose with or without fee is hereby granted, provided that the above
9 * copyright notice and this permission notice appear in all copies.

--- 37 unchanged lines hidden (view full) ---

47
48#define WPI_TX_RADIOTAP_PRESENT \
49 ((1 << IEEE80211_RADIOTAP_FLAGS) | \
50 (1 << IEEE80211_RADIOTAP_RATE) | \
51 (1 << IEEE80211_RADIOTAP_CHANNEL))
52
53struct wpi_dma_info {
54 bus_dma_tag_t tag;
55 bus_dmamap_t map;
55 bus_dmamap_t map;
56 bus_addr_t paddr;
57 caddr_t vaddr;
58 bus_size_t size;
59};
60
61struct wpi_tx_data {
62 bus_dmamap_t map;
63 bus_addr_t cmd_paddr;

--- 114 unchanged lines hidden (view full) ---

178 uint32_t errptr;
179
180 struct resource *irq;
181 struct resource *mem;
182 bus_space_tag_t sc_st;
183 bus_space_handle_t sc_sh;
184 void *sc_ih;
185 bus_size_t sc_sz;
56 bus_addr_t paddr;
57 caddr_t vaddr;
58 bus_size_t size;
59};
60
61struct wpi_tx_data {
62 bus_dmamap_t map;
63 bus_addr_t cmd_paddr;

--- 114 unchanged lines hidden (view full) ---

178 uint32_t errptr;
179
180 struct resource *irq;
181 struct resource *mem;
182 bus_space_tag_t sc_st;
183 bus_space_handle_t sc_sh;
184 void *sc_ih;
185 bus_size_t sc_sz;
186 int sc_cap_off; /* PCIe Capabilities. */
186 int sc_cap_off; /* PCIe Capabilities. */
187
188 struct wpi_rxon rxon;
189 int temp;
190 uint32_t qfullmsk;
191
192 int sc_tx_timer;
193 int sc_scan_timer;
194

--- 23 unchanged lines hidden (view full) ---

218 eeprom_channels[WPI_CHAN_BANDS_COUNT][WPI_MAX_CHAN_PER_BAND];
219 struct wpi_power_group groups[WPI_POWER_GROUPS_COUNT];
220 int8_t maxpwr[IEEE80211_CHAN_MAX];
221 char domain[4]; /* Regulatory domain. */
222};
223
224#define WPI_LOCK_INIT(_sc) \
225 mtx_init(&(_sc)->sc_mtx, device_get_nameunit((_sc)->sc_dev), \
187
188 struct wpi_rxon rxon;
189 int temp;
190 uint32_t qfullmsk;
191
192 int sc_tx_timer;
193 int sc_scan_timer;
194

--- 23 unchanged lines hidden (view full) ---

218 eeprom_channels[WPI_CHAN_BANDS_COUNT][WPI_MAX_CHAN_PER_BAND];
219 struct wpi_power_group groups[WPI_POWER_GROUPS_COUNT];
220 int8_t maxpwr[IEEE80211_CHAN_MAX];
221 char domain[4]; /* Regulatory domain. */
222};
223
224#define WPI_LOCK_INIT(_sc) \
225 mtx_init(&(_sc)->sc_mtx, device_get_nameunit((_sc)->sc_dev), \
226 MTX_NETWORK_LOCK, MTX_DEF)
226 MTX_NETWORK_LOCK, MTX_DEF)
227#define WPI_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx)
228#define WPI_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx)
227#define WPI_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx)
228#define WPI_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx)
229#define WPI_LOCK_ASSERT(sc) mtx_assert(&(sc)->sc_mtx, MA_OWNED)
229#define WPI_LOCK_ASSERT(sc) mtx_assert(&(sc)->sc_mtx, MA_OWNED)
230#define WPI_LOCK_DESTROY(_sc) mtx_destroy(&(_sc)->sc_mtx)
230#define WPI_LOCK_DESTROY(_sc) mtx_destroy(&(_sc)->sc_mtx)