Deleted Added
sdiff udiff text old ( 165352 ) new ( 170530 )
full compact
rt2661var.h (165352) rt2661var.h (170530)
1/* $FreeBSD: head/sys/dev/ral/rt2661var.h 165352 2006-12-19 17:37:41Z bms $ */
1/* $FreeBSD: head/sys/dev/ral/rt2661var.h 170530 2007-06-11 03:36:55Z sam $ */
2
3/*-
4 * Copyright (c) 2005
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.

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

97 enum ieee80211_state, int);
98 device_t sc_dev;
99 bus_space_tag_t sc_st;
100 bus_space_handle_t sc_sh;
101
102 struct mtx sc_mtx;
103
104 struct callout watchdog_ch;
2
3/*-
4 * Copyright (c) 2005
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.

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

97 enum ieee80211_state, int);
98 device_t sc_dev;
99 bus_space_tag_t sc_st;
100 bus_space_handle_t sc_sh;
101
102 struct mtx sc_mtx;
103
104 struct callout watchdog_ch;
105 struct callout scan_ch;
106 struct callout rssadapt_ch;
107
108 int sc_tx_timer;
105 struct callout rssadapt_ch;
106
107 int sc_tx_timer;
109
108 int sc_invalid;
109/*
110 * The same in both up to here
111 * ------------------------------------------------
112 */
113
110 struct ieee80211_channel *sc_curchan;
111
112 uint8_t rf_rev;
113
114 uint8_t rfprog;
115 uint8_t rffreq;
116
117 struct rt2661_tx_ring txq[4];

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

154 int sc_rxtap_len;
155
156 union {
157 struct rt2661_tx_radiotap_header th;
158 uint8_t pad[64];
159 } sc_txtapu;
160#define sc_txtap sc_txtapu.th
161 int sc_txtap_len;
114 struct ieee80211_channel *sc_curchan;
115
116 uint8_t rf_rev;
117
118 uint8_t rfprog;
119 uint8_t rffreq;
120
121 struct rt2661_tx_ring txq[4];

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

158 int sc_rxtap_len;
159
160 union {
161 struct rt2661_tx_radiotap_header th;
162 uint8_t pad[64];
163 } sc_txtapu;
164#define sc_txtap sc_txtapu.th
165 int sc_txtap_len;
166#define RAL_INPUT_RUNNING 1
167 int sc_flags;
162};
163
164int rt2661_attach(device_t, int);
165int rt2661_detach(void *);
166void rt2661_shutdown(void *);
167void rt2661_suspend(void *);
168void rt2661_resume(void *);
169void rt2661_intr(void *);
170
171#define RAL_LOCK(sc) mtx_lock(&(sc)->sc_mtx)
172#define RAL_UNLOCK(sc) mtx_unlock(&(sc)->sc_mtx)
168};
169
170int rt2661_attach(device_t, int);
171int rt2661_detach(void *);
172void rt2661_shutdown(void *);
173void rt2661_suspend(void *);
174void rt2661_resume(void *);
175void rt2661_intr(void *);
176
177#define RAL_LOCK(sc) mtx_lock(&(sc)->sc_mtx)
178#define RAL_UNLOCK(sc) mtx_unlock(&(sc)->sc_mtx)