Deleted Added
sdiff udiff text old ( 190749 ) new ( 191746 )
full compact
if_zydreg.h (190749) if_zydreg.h (191746)
1/* $OpenBSD: if_zydreg.h,v 1.19 2006/11/30 19:28:07 damien Exp $ */
2/* $NetBSD: if_zydreg.h,v 1.2 2007/06/16 11:18:45 kiyohara Exp $ */
1/* $OpenBSD: if_zydreg.h,v 1.19 2006/11/30 19:28:07 damien Exp $ */
2/* $NetBSD: if_zydreg.h,v 1.2 2007/06/16 11:18:45 kiyohara Exp $ */
3/* $FreeBSD: head/sys/dev/usb/wlan/if_zydreg.h 190749 2009-04-05 21:24:15Z piso $ */
3/* $FreeBSD: head/sys/dev/usb/wlan/if_zydreg.h 191746 2009-05-02 15:14:18Z thompsa $ */
4
5/*-
6 * Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr>
7 * Copyright (c) 2006 by Florian Stoehr <ich@florian-stoehr.de>
8 *
9 * Permission to use, copy, modify, and distribute this software for any
10 * purpose with or without fee is hereby granted, provided that the above
11 * copyright notice and this permission notice appear in all copies.

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

1158 uint8_t val;
1159};
1160
1161struct zyd_mac_pair {
1162 uint16_t reg;
1163 uint32_t val;
1164};
1165
4
5/*-
6 * Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr>
7 * Copyright (c) 2006 by Florian Stoehr <ich@florian-stoehr.de>
8 *
9 * Permission to use, copy, modify, and distribute this software for any
10 * purpose with or without fee is hereby granted, provided that the above
11 * copyright notice and this permission notice appear in all copies.

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

1158 uint8_t val;
1159};
1160
1161struct zyd_mac_pair {
1162 uint16_t reg;
1163 uint32_t val;
1164};
1165
1166struct zyd_task {
1167 struct usb2_proc_msg hdr;
1168 usb2_proc_callback_t *func;
1169 struct zyd_softc *sc;
1170};
1171
1172struct zyd_tx_data {
1173 STAILQ_ENTRY(zyd_tx_data) next;
1174 struct zyd_softc *sc;
1175 struct zyd_tx_desc desc;
1176 struct mbuf *m;
1177 struct ieee80211_node *ni;
1178 int rate;
1179};

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

1243 int flags;
1244 STAILQ_ENTRY(zyd_rq) rq;
1245};
1246
1247struct zyd_vap {
1248 struct ieee80211vap vap;
1249 int (*newstate)(struct ieee80211vap *,
1250 enum ieee80211_state, int);
1166struct zyd_tx_data {
1167 STAILQ_ENTRY(zyd_tx_data) next;
1168 struct zyd_softc *sc;
1169 struct zyd_tx_desc desc;
1170 struct mbuf *m;
1171 struct ieee80211_node *ni;
1172 int rate;
1173};

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

1237 int flags;
1238 STAILQ_ENTRY(zyd_rq) rq;
1239};
1240
1241struct zyd_vap {
1242 struct ieee80211vap vap;
1243 int (*newstate)(struct ieee80211vap *,
1244 enum ieee80211_state, int);
1251 struct zyd_softc *sc;
1252 struct ieee80211_amrr amrr;
1253};
1254#define ZYD_VAP(vap) ((struct zyd_vap *)(vap))
1255
1256enum {
1257 ZYD_BULK_WR,
1258 ZYD_BULK_RD,
1259 ZYD_INTR_WR,
1260 ZYD_INTR_RD,
1261 ZYD_N_TRANSFER = 4,
1262};
1263
1264struct zyd_softc {
1265 struct ifnet *sc_ifp;
1266 device_t sc_dev;
1267 struct usb2_device *sc_udev;
1245 struct ieee80211_amrr amrr;
1246};
1247#define ZYD_VAP(vap) ((struct zyd_vap *)(vap))
1248
1249enum {
1250 ZYD_BULK_WR,
1251 ZYD_BULK_RD,
1252 ZYD_INTR_WR,
1253 ZYD_INTR_RD,
1254 ZYD_N_TRANSFER = 4,
1255};
1256
1257struct zyd_softc {
1258 struct ifnet *sc_ifp;
1259 device_t sc_dev;
1260 struct usb2_device *sc_udev;
1268 struct usb2_process sc_tq;
1269
1270 struct usb2_xfer *sc_xfer[ZYD_N_TRANSFER];
1261
1262 struct usb2_xfer *sc_xfer[ZYD_N_TRANSFER];
1271 struct zyd_task *sc_last_task;
1272
1263
1273 enum ieee80211_state sc_state;
1274 int sc_arg;
1275 int sc_flags;
1276#define ZYD_FLAG_FWLOADED (1 << 0)
1277#define ZYD_FLAG_INITONCE (1 << 1)
1278#define ZYD_FLAG_INITDONE (1 << 2)
1279
1264 int sc_flags;
1265#define ZYD_FLAG_FWLOADED (1 << 0)
1266#define ZYD_FLAG_INITONCE (1 << 1)
1267#define ZYD_FLAG_INITDONE (1 << 2)
1268
1280 struct zyd_task sc_synctask[2];
1281 struct zyd_task sc_mcasttask[2];
1282 struct zyd_task sc_scantask[2];
1283 int sc_scan_action;
1284#define ZYD_SCAN_START 0
1285#define ZYD_SCAN_END 1
1286#define ZYD_SET_CHANNEL 2
1287 struct zyd_task sc_task[2];
1288
1289 struct zyd_rf sc_rf;
1290
1291 STAILQ_HEAD(, zyd_rq) sc_rtx;
1292 STAILQ_HEAD(, zyd_rq) sc_rqh;
1293
1294 uint8_t sc_bssid[IEEE80211_ADDR_LEN];
1295 uint16_t sc_fwbase;
1296 uint8_t sc_regdomain;

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

1312
1313 uint8_t sc_pwrcal[14];
1314 uint8_t sc_pwrint[14];
1315 uint8_t sc_ofdm36_cal[14];
1316 uint8_t sc_ofdm48_cal[14];
1317 uint8_t sc_ofdm54_cal[14];
1318
1319 struct mtx sc_mtx;
1269 struct zyd_rf sc_rf;
1270
1271 STAILQ_HEAD(, zyd_rq) sc_rtx;
1272 STAILQ_HEAD(, zyd_rq) sc_rqh;
1273
1274 uint8_t sc_bssid[IEEE80211_ADDR_LEN];
1275 uint16_t sc_fwbase;
1276 uint8_t sc_regdomain;

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

1292
1293 uint8_t sc_pwrcal[14];
1294 uint8_t sc_pwrint[14];
1295 uint8_t sc_ofdm36_cal[14];
1296 uint8_t sc_ofdm48_cal[14];
1297 uint8_t sc_ofdm54_cal[14];
1298
1299 struct mtx sc_mtx;
1320 struct cv sc_cmd_cv;
1321 struct zyd_tx_data tx_data[ZYD_TX_LIST_CNT];
1322 zyd_txdhead tx_q;
1323 zyd_txdhead tx_free;
1324 int tx_nfree;
1325 struct zyd_rx_desc sc_rx_desc;
1326 struct zyd_rx_data sc_rx_data[ZYD_MAX_RXFRAMECNT];
1327 int sc_rx_count;
1328

--- 12 unchanged lines hidden --- 		1300 struct zyd_tx_data tx_data[ZYD_TX_LIST_CNT];
1301 zyd_txdhead tx_q;
1302 zyd_txdhead tx_free;
1303 int tx_nfree;
1304 struct zyd_rx_desc sc_rx_desc;
1305 struct zyd_rx_data sc_rx_data[ZYD_MAX_RXFRAMECNT];
1306 int sc_rx_count;
1307

--- 12 unchanged lines hidden ---