Deleted Added
full compact
if_wpivar.h (283536) if_wpivar.h (286410)
1/* $FreeBSD: head/sys/dev/wpi/if_wpivar.h 283536 2015-05-25 17:06:52Z adrian $ */
1/* $FreeBSD: head/sys/dev/wpi/if_wpivar.h 286410 2015-08-07 11:43:14Z glebius $ */
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.

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

67
68struct wpi_tx_ring {
69 struct wpi_dma_info desc_dma;
70 struct wpi_dma_info cmd_dma;
71 struct wpi_tx_desc *desc;
72 struct wpi_tx_cmd *cmd;
73 struct wpi_tx_data data[WPI_TX_RING_COUNT];
74 bus_dma_tag_t data_dmat;
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.

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

67
68struct wpi_tx_ring {
69 struct wpi_dma_info desc_dma;
70 struct wpi_dma_info cmd_dma;
71 struct wpi_tx_desc *desc;
72 struct wpi_tx_cmd *cmd;
73 struct wpi_tx_data data[WPI_TX_RING_COUNT];
74 bus_dma_tag_t data_dmat;
75 struct mbufq snd;
75 int qid;
76 int queued;
77 int cur;
78 int update;
79};
80
81struct wpi_rx_data {
82 struct mbuf *m;

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

159 size_t size;
160 struct wpi_fw_part init;
161 struct wpi_fw_part main;
162 struct wpi_fw_part boot;
163};
164
165struct wpi_softc {
166 device_t sc_dev;
76 int qid;
77 int queued;
78 int cur;
79 int update;
80};
81
82struct wpi_rx_data {
83 struct mbuf *m;

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

160 size_t size;
161 struct wpi_fw_part init;
162 struct wpi_fw_part main;
163 struct wpi_fw_part boot;
164};
165
166struct wpi_softc {
167 device_t sc_dev;
167
168 struct ifnet *sc_ifp;
169 int sc_debug;
170
171 int sc_flags;
172#define WPI_PS_PATH (1 << 0)
168 int sc_debug;
169
170 int sc_flags;
171#define WPI_PS_PATH (1 << 0)
172 int sc_running;
173
174 struct mtx sc_mtx;
173
174 struct mtx sc_mtx;
175 struct ieee80211com sc_ic;
176
175 struct mtx tx_mtx;
176
177 /* Shared area. */
178 struct wpi_dma_info shared_dma;
179 struct wpi_shared *shared;
180
181 struct wpi_tx_ring txq[WPI_NTXQUEUES];
182 struct mtx txq_mtx;
183 struct mtx txq_state_mtx;
177 struct mtx tx_mtx;
178
179 /* Shared area. */
180 struct wpi_dma_info shared_dma;
181 struct wpi_shared *shared;
182
183 struct wpi_tx_ring txq[WPI_NTXQUEUES];
184 struct mtx txq_mtx;
185 struct mtx txq_state_mtx;
184 uint32_t txq_active;
185
186 struct wpi_rx_ring rxq;
187 uint64_t rx_tstamp;
188
189 /* TX Thermal Callibration. */
190 struct callout calib_to;
191 int calib_cnt;
192

--- 109 unchanged lines hidden ---
186
187 struct wpi_rx_ring rxq;
188 uint64_t rx_tstamp;
189
190 /* TX Thermal Callibration. */
191 struct callout calib_to;
192 int calib_cnt;
193

--- 109 unchanged lines hidden ---