KNF. That is change u_intN_t to uintN_t.
This commit is contained in:
skrll
parent
f80595ca7d
commit
fbe43fd3d2
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: if_iwi.c,v 1.23 2005/09/15 19:56:50 skrll Exp $ */
|
||||
/* $NetBSD: if_iwi.c,v 1.24 2005/09/17 12:40:27 skrll Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2004, 2005
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: if_iwi.c,v 1.23 2005/09/15 19:56:50 skrll Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: if_iwi.c,v 1.24 2005/09/17 12:40:27 skrll Exp $");
|
||||
|
||||
/*-
|
||||
* Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver
|
||||
|
|
@ -111,7 +111,7 @@ static void iwi_free_rx_ring(struct iwi_softc *, struct iwi_rx_ring *);
|
|||
|
||||
static int iwi_media_change(struct ifnet *);
|
||||
static void iwi_media_status(struct ifnet *, struct ifmediareq *);
|
||||
static u_int16_t iwi_read_prom_word(struct iwi_softc *, u_int8_t);
|
||||
static uint16_t iwi_read_prom_word(struct iwi_softc *, uint8_t);
|
||||
static int iwi_newstate(struct ieee80211com *, enum ieee80211_state, int);
|
||||
static void iwi_fix_channel(struct ieee80211com *, struct mbuf *);
|
||||
static void iwi_frame_intr(struct iwi_softc *, struct iwi_rx_data *, int,
|
||||
|
|
@ -121,11 +121,11 @@ static void iwi_notification_intr(struct iwi_softc *, struct iwi_rx_data *,
|
|||
static void iwi_rx_intr(struct iwi_softc *);
|
||||
static void iwi_tx_intr(struct iwi_softc *);
|
||||
static int iwi_intr(void *);
|
||||
static int iwi_cmd(struct iwi_softc *, u_int8_t, void *, u_int8_t, int);
|
||||
static int iwi_cmd(struct iwi_softc *, uint8_t, void *, uint8_t, int);
|
||||
static int iwi_tx_start(struct ifnet *, struct mbuf *, struct ieee80211_node *);
|
||||
static void iwi_start(struct ifnet *);
|
||||
static void iwi_watchdog(struct ifnet *);
|
||||
static int iwi_get_table0(struct iwi_softc *, u_int32_t *);
|
||||
static int iwi_get_table0(struct iwi_softc *, uint32_t *);
|
||||
static int iwi_get_radio(struct iwi_softc *, int *);
|
||||
static int iwi_ioctl(struct ifnet *, u_long, caddr_t);
|
||||
static void iwi_stop_master(struct iwi_softc *);
|
||||
|
|
@ -153,15 +153,15 @@ static const struct ieee80211_rateset iwi_rateset_11b =
|
|||
static const struct ieee80211_rateset iwi_rateset_11g =
|
||||
{ 12, { 2, 4, 11, 22, 12, 18, 24, 36, 48, 72, 96, 108 } };
|
||||
|
||||
static __inline u_int8_t
|
||||
MEM_READ_1(struct iwi_softc *sc, u_int32_t addr)
|
||||
static __inline uint8_t
|
||||
MEM_READ_1(struct iwi_softc *sc, uint32_t addr)
|
||||
{
|
||||
CSR_WRITE_4(sc, IWI_CSR_INDIRECT_ADDR, addr);
|
||||
return CSR_READ_1(sc, IWI_CSR_INDIRECT_DATA);
|
||||
}
|
||||
|
||||
static __inline u_int32_t
|
||||
MEM_READ_4(struct iwi_softc *sc, u_int32_t addr)
|
||||
static __inline uint32_t
|
||||
MEM_READ_4(struct iwi_softc *sc, uint32_t addr)
|
||||
{
|
||||
CSR_WRITE_4(sc, IWI_CSR_INDIRECT_ADDR, addr);
|
||||
return CSR_READ_4(sc, IWI_CSR_INDIRECT_DATA);
|
||||
|
|
@ -204,7 +204,7 @@ iwi_attach(struct device *parent, struct device *self, void *aux)
|
|||
bus_addr_t base;
|
||||
pci_intr_handle_t ih;
|
||||
pcireg_t data;
|
||||
u_int16_t val;
|
||||
uint16_t val;
|
||||
int error, revision, i;
|
||||
|
||||
sc->sc_pct = pa->pa_pc;
|
||||
|
|
@ -810,7 +810,7 @@ iwi_media_status(struct ifnet *ifp, struct ifmediareq *imr)
|
|||
struct ieee80211com *ic = &sc->sc_ic;
|
||||
#define N(a) (sizeof (a) / sizeof (a[0]))
|
||||
static const struct {
|
||||
u_int32_t val;
|
||||
uint32_t val;
|
||||
int rate;
|
||||
} rates[] = {
|
||||
{ IWI_RATE_DS1, 2 },
|
||||
|
|
@ -826,7 +826,7 @@ iwi_media_status(struct ifnet *ifp, struct ifmediareq *imr)
|
|||
{ IWI_RATE_OFDM48, 96 },
|
||||
{ IWI_RATE_OFDM54, 108 },
|
||||
};
|
||||
u_int32_t val;
|
||||
uint32_t val;
|
||||
int rate, i;
|
||||
|
||||
imr->ifm_status = IFM_AVALID;
|
||||
|
|
@ -906,11 +906,11 @@ iwi_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg)
|
|||
/*
|
||||
* Read 16 bits at address 'addr' from the serial EEPROM.
|
||||
*/
|
||||
static u_int16_t
|
||||
iwi_read_prom_word(struct iwi_softc *sc, u_int8_t addr)
|
||||
static uint16_t
|
||||
iwi_read_prom_word(struct iwi_softc *sc, uint8_t addr)
|
||||
{
|
||||
u_int32_t tmp;
|
||||
u_int16_t val;
|
||||
uint32_t tmp;
|
||||
uint16_t val;
|
||||
int n;
|
||||
|
||||
/* Clock C once before the first command */
|
||||
|
|
@ -966,8 +966,8 @@ static void
|
|||
iwi_fix_channel(struct ieee80211com *ic, struct mbuf *m)
|
||||
{
|
||||
struct ieee80211_frame *wh;
|
||||
u_int8_t subtype;
|
||||
u_int8_t *frm, *efrm;
|
||||
uint8_t subtype;
|
||||
uint8_t *frm, *efrm;
|
||||
|
||||
wh = mtod(m, struct ieee80211_frame *);
|
||||
|
||||
|
|
@ -980,8 +980,8 @@ iwi_fix_channel(struct ieee80211com *ic, struct mbuf *m)
|
|||
subtype != IEEE80211_FC0_SUBTYPE_PROBE_RESP)
|
||||
return;
|
||||
|
||||
frm = (u_int8_t *)(wh + 1);
|
||||
efrm = mtod(m, u_int8_t *) + m->m_len;
|
||||
frm = (uint8_t *)(wh + 1);
|
||||
efrm = mtod(m, uint8_t *) + m->m_len;
|
||||
|
||||
frm += 12; /* skip tstamp, bintval and capinfo fields */
|
||||
while (frm < efrm) {
|
||||
|
|
@ -1229,7 +1229,7 @@ iwi_tx_intr(struct iwi_softc *sc)
|
|||
{
|
||||
struct ifnet *ifp = &sc->sc_if;
|
||||
struct iwi_tx_data *data;
|
||||
u_int32_t hw;
|
||||
uint32_t hw;
|
||||
|
||||
hw = CSR_READ_4(sc, IWI_CSR_TX1_RIDX);
|
||||
|
||||
|
|
@ -1263,7 +1263,7 @@ static int
|
|||
iwi_intr(void *arg)
|
||||
{
|
||||
struct iwi_softc *sc = arg;
|
||||
u_int32_t r;
|
||||
uint32_t r;
|
||||
|
||||
if ((r = CSR_READ_4(sc, IWI_CSR_INTR)) == 0 || r == 0xffffffff)
|
||||
return 0;
|
||||
|
|
@ -1307,7 +1307,7 @@ iwi_intr(void *arg)
|
|||
}
|
||||
|
||||
static int
|
||||
iwi_cmd(struct iwi_softc *sc, u_int8_t type, void *data, u_int8_t len,
|
||||
iwi_cmd(struct iwi_softc *sc, uint8_t type, void *data, uint8_t len,
|
||||
int async)
|
||||
{
|
||||
struct iwi_cmd_desc *desc;
|
||||
|
|
@ -1542,9 +1542,9 @@ iwi_watchdog(struct ifnet *ifp)
|
|||
}
|
||||
|
||||
static int
|
||||
iwi_get_table0(struct iwi_softc *sc, u_int32_t *tbl)
|
||||
iwi_get_table0(struct iwi_softc *sc, uint32_t *tbl)
|
||||
{
|
||||
u_int32_t size, buf[128];
|
||||
uint32_t size, buf[128];
|
||||
|
||||
if (!(sc->flags & IWI_FLAG_FW_INITED)) {
|
||||
memset(buf, 0, sizeof buf);
|
||||
|
|
@ -1588,7 +1588,7 @@ iwi_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
|
|||
|
||||
case SIOCGTABLE0:
|
||||
ifr = (struct ifreq *)data;
|
||||
error = iwi_get_table0(sc, (u_int32_t *)ifr->ifr_data);
|
||||
error = iwi_get_table0(sc, (uint32_t *)ifr->ifr_data);
|
||||
break;
|
||||
|
||||
case SIOCGRADIO:
|
||||
|
|
@ -1696,7 +1696,7 @@ iwi_reset(struct iwi_softc *sc)
|
|||
static int
|
||||
iwi_load_ucode(struct iwi_softc *sc, void *uc, int size)
|
||||
{
|
||||
u_int16_t *w;
|
||||
uint16_t *w;
|
||||
int ntries, i;
|
||||
|
||||
CSR_WRITE_4(sc, IWI_CSR_RST, CSR_READ_4(sc, IWI_CSR_RST) |
|
||||
|
|
@ -1764,7 +1764,7 @@ iwi_load_firmware(struct iwi_softc *sc, void *fw, int size)
|
|||
bus_dma_segment_t seg;
|
||||
caddr_t virtaddr;
|
||||
u_char *p, *end;
|
||||
u_int32_t sentinel, ctl, src, dst, sum, len, mlen;
|
||||
uint32_t sentinel, ctl, src, dst, sum, len, mlen;
|
||||
int ntries, nsegs, error;
|
||||
|
||||
/* Allocate DMA memory for storing firmware image */
|
||||
|
|
@ -1980,7 +1980,7 @@ iwi_config(struct iwi_softc *sc)
|
|||
struct iwi_txpower power;
|
||||
struct ieee80211_key *wk;
|
||||
struct iwi_wep_key wepkey;
|
||||
u_int32_t data;
|
||||
uint32_t data;
|
||||
int error, i;
|
||||
|
||||
IEEE80211_ADDR_COPY(ic->ic_myaddr, LLADDR(ifp->if_sadl));
|
||||
|
|
@ -2111,7 +2111,7 @@ iwi_scan(struct iwi_softc *sc)
|
|||
{
|
||||
struct ieee80211com *ic = &sc->sc_ic;
|
||||
struct iwi_scan scan;
|
||||
u_int8_t *p;
|
||||
uint8_t *p;
|
||||
int i, count;
|
||||
|
||||
(void)memset(&scan, 0, sizeof scan);
|
||||
|
|
@ -2152,8 +2152,8 @@ iwi_auth_and_assoc(struct iwi_softc *sc)
|
|||
struct iwi_configuration config;
|
||||
struct iwi_associate assoc;
|
||||
struct iwi_rateset rs;
|
||||
u_int16_t capinfo;
|
||||
u_int32_t data;
|
||||
uint16_t capinfo;
|
||||
uint32_t data;
|
||||
int error;
|
||||
|
||||
if (IEEE80211_IS_CHAN_2GHZ(ni->ni_chan)) {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: if_iwireg.h,v 1.6 2005/09/12 21:15:04 skrll Exp $ */
|
||||
/* $NetBSD: if_iwireg.h,v 1.7 2005/09/17 12:40:28 skrll Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2004, 2005
|
||||
|
|
@ -126,20 +126,22 @@
|
|||
#define IWI_RATE_OFDM54 3
|
||||
|
||||
struct iwi_hdr {
|
||||
u_int8_t type;
|
||||
uint8_t type;
|
||||
#define IWI_HDR_TYPE_DATA 0
|
||||
#define IWI_HDR_TYPE_COMMAND 1
|
||||
#define IWI_HDR_TYPE_NOTIF 3
|
||||
#define IWI_HDR_TYPE_FRAME 9
|
||||
u_int8_t seq;
|
||||
u_int8_t flags;
|
||||
|
||||
uint8_t seq;
|
||||
uint8_t flags;
|
||||
#define IWI_HDR_FLAG_IRQ 0x04
|
||||
u_int8_t reserved;
|
||||
|
||||
uint8_t reserved;
|
||||
} __attribute__((__packed__));
|
||||
|
||||
struct iwi_notif {
|
||||
u_int32_t reserved[2];
|
||||
u_int8_t type;
|
||||
uint32_t reserved[2];
|
||||
uint8_t type;
|
||||
#define IWI_NOTIF_TYPE_ASSOCIATION 10
|
||||
#define IWI_NOTIF_TYPE_AUTHENTICATION 11
|
||||
#define IWI_NOTIF_TYPE_SCAN_CHANNEL 12
|
||||
|
|
@ -147,96 +149,98 @@ struct iwi_notif {
|
|||
#define IWI_NOTIF_TYPE_BEACON 17
|
||||
#define IWI_NOTIF_TYPE_CALIBRATION 20
|
||||
#define IWI_NOTIF_TYPE_NOISE 25
|
||||
u_int8_t flags;
|
||||
u_int16_t len;
|
||||
|
||||
uint8_t flags;
|
||||
uint16_t len;
|
||||
} __attribute__((__packed__));
|
||||
|
||||
/* structure for notification IWI_NOTIF_TYPE_AUTHENTICATION */
|
||||
struct iwi_notif_authentication {
|
||||
u_int8_t state;
|
||||
uint8_t state;
|
||||
#define IWI_DEAUTHENTICATED 0
|
||||
#define IWI_AUTHENTICATED 9
|
||||
} __attribute__((__packed__));
|
||||
|
||||
/* structure for notification IWI_NOTIF_TYPE_ASSOCIATION */
|
||||
struct iwi_notif_association {
|
||||
u_int8_t state;
|
||||
uint8_t state;
|
||||
#define IWI_DEASSOCIATED 0
|
||||
#define IWI_ASSOCIATED 12
|
||||
|
||||
struct ieee80211_frame frame;
|
||||
u_int16_t capinfo;
|
||||
u_int16_t status;
|
||||
u_int16_t associd;
|
||||
uint16_t capinfo;
|
||||
uint16_t status;
|
||||
uint16_t associd;
|
||||
} __attribute__((__packed__));
|
||||
|
||||
/* structure for notification IWI_NOTIF_TYPE_SCAN_CHANNEL */
|
||||
struct iwi_notif_scan_channel {
|
||||
u_int8_t nchan;
|
||||
u_int8_t reserved[47];
|
||||
uint8_t nchan;
|
||||
uint8_t reserved[47];
|
||||
} __attribute__((__packed__));
|
||||
|
||||
/* structure for notification IWI_NOTIF_TYPE_SCAN_COMPLETE */
|
||||
struct iwi_notif_scan_complete {
|
||||
u_int8_t type;
|
||||
u_int8_t nchan;
|
||||
u_int8_t status;
|
||||
u_int8_t reserved;
|
||||
uint8_t type;
|
||||
uint8_t nchan;
|
||||
uint8_t status;
|
||||
uint8_t reserved;
|
||||
} __attribute__((__packed__));
|
||||
|
||||
/* received frame header */
|
||||
struct iwi_frame {
|
||||
u_int32_t reserved1[2];
|
||||
u_int8_t chan;
|
||||
u_int8_t status;
|
||||
u_int8_t rate;
|
||||
u_int8_t rssi; /* receiver signal strength indicator */
|
||||
u_int8_t agc; /* automatic gain control */
|
||||
u_int8_t rssi_dbm;
|
||||
u_int16_t signal;
|
||||
u_int16_t noise;
|
||||
u_int8_t antenna;
|
||||
u_int8_t control;
|
||||
u_int8_t reserved2[2];
|
||||
u_int16_t len;
|
||||
uint32_t reserved1[2];
|
||||
uint8_t chan;
|
||||
uint8_t status;
|
||||
uint8_t rate;
|
||||
uint8_t rssi; /* receiver signal strength indicator */
|
||||
uint8_t agc; /* automatic gain control */
|
||||
uint8_t rssi_dbm;
|
||||
uint16_t signal;
|
||||
uint16_t noise;
|
||||
uint8_t antenna;
|
||||
uint8_t control;
|
||||
uint8_t reserved2[2];
|
||||
uint16_t len;
|
||||
} __attribute__((__packed__));
|
||||
|
||||
/* header for transmission */
|
||||
struct iwi_tx_desc {
|
||||
struct iwi_hdr hdr;
|
||||
u_int32_t reserved1;
|
||||
u_int8_t station;
|
||||
u_int8_t reserved2[3];
|
||||
u_int8_t cmd;
|
||||
uint32_t reserved1;
|
||||
uint8_t station;
|
||||
uint8_t reserved2[3];
|
||||
uint8_t cmd;
|
||||
#define IWI_DATA_CMD_TX 0x0b
|
||||
u_int8_t seq;
|
||||
u_int16_t len;
|
||||
u_int8_t priority;
|
||||
u_int8_t flags;
|
||||
|
||||
uint8_t seq;
|
||||
uint16_t len;
|
||||
uint8_t priority;
|
||||
uint8_t flags;
|
||||
#define IWI_DATA_FLAG_SHPREAMBLE 0x04
|
||||
#define IWI_DATA_FLAG_NO_WEP 0x20
|
||||
#define IWI_DATA_FLAG_NEED_ACK 0x80
|
||||
u_int8_t xflags;
|
||||
u_int8_t wep_txkey;
|
||||
u_int8_t wepkey[IEEE80211_KEYBUF_SIZE];
|
||||
u_int8_t rate;
|
||||
u_int8_t antenna;
|
||||
u_int8_t reserved3[10];
|
||||
|
||||
uint8_t xflags;
|
||||
uint8_t wep_txkey;
|
||||
uint8_t wepkey[IEEE80211_KEYBUF_SIZE];
|
||||
uint8_t rate;
|
||||
uint8_t antenna;
|
||||
uint8_t reserved3[10];
|
||||
struct ieee80211_qosframe_addr4 wh;
|
||||
u_int32_t iv;
|
||||
u_int32_t eiv;
|
||||
|
||||
u_int32_t nseg;
|
||||
uint32_t iv;
|
||||
uint32_t eiv;
|
||||
uint32_t nseg;
|
||||
#define IWI_MAX_NSEG 6
|
||||
u_int32_t seg_addr[IWI_MAX_NSEG];
|
||||
u_int16_t seg_len[IWI_MAX_NSEG];
|
||||
|
||||
uint32_t seg_addr[IWI_MAX_NSEG];
|
||||
uint16_t seg_len[IWI_MAX_NSEG];
|
||||
} __attribute__((__packed__));
|
||||
|
||||
/* command */
|
||||
struct iwi_cmd_desc {
|
||||
struct iwi_hdr hdr;
|
||||
u_int8_t type;
|
||||
uint8_t type;
|
||||
#define IWI_CMD_ENABLE 2
|
||||
#define IWI_CMD_SET_CONFIGURATION 6
|
||||
#define IWI_CMD_SET_ESSID 8
|
||||
|
|
@ -254,9 +258,10 @@ struct iwi_cmd_desc {
|
|||
#define IWI_CMD_SET_IV 34
|
||||
#define IWI_CMD_SET_TX_POWER 35
|
||||
#define IWI_CMD_SET_SENSITIVITY 42
|
||||
u_int8_t len;
|
||||
u_int16_t reserved;
|
||||
u_int8_t data[120];
|
||||
|
||||
uint8_t len;
|
||||
uint16_t reserved;
|
||||
uint8_t data[120];
|
||||
} __attribute__((__packed__));
|
||||
|
||||
/* constants for 'mode' fields */
|
||||
|
|
@ -269,22 +274,23 @@ struct iwi_cmd_desc {
|
|||
|
||||
/* structure for command IWI_CMD_SET_RATES */
|
||||
struct iwi_rateset {
|
||||
u_int8_t mode;
|
||||
u_int8_t nrates;
|
||||
u_int8_t type;
|
||||
uint8_t mode;
|
||||
uint8_t nrates;
|
||||
uint8_t type;
|
||||
#define IWI_RATESET_TYPE_NEGOTIATED 0
|
||||
#define IWI_RATESET_TYPE_SUPPORTED 1
|
||||
u_int8_t reserved;
|
||||
u_int8_t rates[12];
|
||||
|
||||
uint8_t reserved;
|
||||
uint8_t rates[12];
|
||||
} __attribute__((__packed__));
|
||||
|
||||
/* structure for command IWI_CMD_SET_TX_POWER */
|
||||
struct iwi_txpower {
|
||||
u_int8_t nchan;
|
||||
u_int8_t mode;
|
||||
uint8_t nchan;
|
||||
uint8_t mode;
|
||||
struct {
|
||||
u_int8_t chan;
|
||||
u_int8_t power;
|
||||
uint8_t chan;
|
||||
uint8_t power;
|
||||
#define IWI_TXPOWER_MAX 20
|
||||
#define IWI_TXPOWER_RATIO (IEEE80211_TXPOWER_MAX / IWI_TXPOWER_MAX)
|
||||
} __attribute__((__packed__)) chan[37];
|
||||
|
|
@ -292,76 +298,78 @@ struct iwi_txpower {
|
|||
|
||||
/* structure for command IWI_CMD_ASSOCIATE */
|
||||
struct iwi_associate {
|
||||
u_int8_t chan;
|
||||
u_int8_t auth;
|
||||
uint8_t chan;
|
||||
uint8_t auth;
|
||||
#define IWI_AUTH_OPEN 0
|
||||
#define IWI_AUTH_SHARED 1
|
||||
#define IWI_AUTH_NONE 3
|
||||
u_int8_t type;
|
||||
u_int8_t reserved1;
|
||||
u_int16_t policy;
|
||||
|
||||
uint8_t type;
|
||||
uint8_t reserved1;
|
||||
uint16_t policy;
|
||||
#define IWI_POLICY_OPTIE 2
|
||||
|
||||
u_int8_t plen;
|
||||
u_int8_t mode;
|
||||
u_int8_t bssid[IEEE80211_ADDR_LEN];
|
||||
u_int8_t tstamp[8];
|
||||
u_int16_t capinfo;
|
||||
u_int16_t lintval;
|
||||
u_int16_t intval;
|
||||
u_int8_t dst[IEEE80211_ADDR_LEN];
|
||||
u_int32_t reserved3;
|
||||
u_int16_t reserved4;
|
||||
uint8_t plen;
|
||||
uint8_t mode;
|
||||
uint8_t bssid[IEEE80211_ADDR_LEN];
|
||||
uint8_t tstamp[8];
|
||||
uint16_t capinfo;
|
||||
uint16_t lintval;
|
||||
uint16_t intval;
|
||||
uint8_t dst[IEEE80211_ADDR_LEN];
|
||||
uint32_t reserved3;
|
||||
uint16_t reserved4;
|
||||
} __attribute__((__packed__));
|
||||
|
||||
#define IWI_SCAN_CHANNELS 54
|
||||
|
||||
/* structure for command IWI_CMD_SCAN */
|
||||
struct iwi_scan {
|
||||
u_int8_t type;
|
||||
uint8_t type;
|
||||
#define IWI_SCAN_TYPE_PASSIVE 1
|
||||
#define IWI_SCAN_TYPE_BROADCAST 3
|
||||
|
||||
u_int16_t dwelltime;
|
||||
u_int8_t channels[IWI_SCAN_CHANNELS];
|
||||
uint16_t dwelltime;
|
||||
uint8_t channels[IWI_SCAN_CHANNELS];
|
||||
#define IWI_CHAN_5GHZ (0 << 6)
|
||||
#define IWI_CHAN_2GHZ (1 << 6)
|
||||
|
||||
u_int8_t reserved[3];
|
||||
uint8_t reserved[3];
|
||||
} __attribute__((__packed__));
|
||||
|
||||
/* structure for command IWI_CMD_SET_CONFIGURATION */
|
||||
struct iwi_configuration {
|
||||
u_int8_t bluetooth_coexistence;
|
||||
u_int8_t reserved1;
|
||||
u_int8_t answer_pbreq;
|
||||
u_int8_t allow_invalid_frames;
|
||||
u_int8_t multicast_enabled;
|
||||
u_int8_t drop_unicast_unencrypted;
|
||||
u_int8_t disable_unicast_decryption;
|
||||
u_int8_t drop_multicast_unencrypted;
|
||||
u_int8_t disable_multicast_decryption;
|
||||
u_int8_t antenna;
|
||||
u_int8_t reserved2;
|
||||
u_int8_t use_protection;
|
||||
u_int8_t protection_ctsonly;
|
||||
u_int8_t enable_multicast_filtering;
|
||||
u_int8_t bluetooth_threshold;
|
||||
u_int8_t reserved4;
|
||||
u_int8_t allow_beacon_and_probe_resp;
|
||||
u_int8_t allow_mgt;
|
||||
u_int8_t noise_reported;
|
||||
u_int8_t reserved5;
|
||||
uint8_t bluetooth_coexistence;
|
||||
uint8_t reserved1;
|
||||
uint8_t answer_pbreq;
|
||||
uint8_t allow_invalid_frames;
|
||||
uint8_t multicast_enabled;
|
||||
uint8_t drop_unicast_unencrypted;
|
||||
uint8_t disable_unicast_decryption;
|
||||
uint8_t drop_multicast_unencrypted;
|
||||
uint8_t disable_multicast_decryption;
|
||||
uint8_t antenna;
|
||||
uint8_t reserved2;
|
||||
uint8_t use_protection;
|
||||
uint8_t protection_ctsonly;
|
||||
uint8_t enable_multicast_filtering;
|
||||
uint8_t bluetooth_threshold;
|
||||
uint8_t reserved4;
|
||||
uint8_t allow_beacon_and_probe_resp;
|
||||
uint8_t allow_mgt;
|
||||
uint8_t noise_reported;
|
||||
uint8_t reserved5;
|
||||
} __attribute__((__packed__));
|
||||
|
||||
/* structure for command IWI_CMD_SET_WEP_KEY */
|
||||
struct iwi_wep_key {
|
||||
u_int8_t cmd;
|
||||
uint8_t cmd;
|
||||
#define IWI_WEP_KEY_CMD_SETKEY 0x08
|
||||
u_int8_t seq;
|
||||
u_int8_t idx;
|
||||
u_int8_t len;
|
||||
u_int8_t key[IEEE80211_KEYBUF_SIZE];
|
||||
|
||||
uint8_t seq;
|
||||
uint8_t idx;
|
||||
uint8_t len;
|
||||
uint8_t key[IEEE80211_KEYBUF_SIZE];
|
||||
} __attribute__((__packed__));
|
||||
|
||||
/* EEPROM = Electrically Erasable Programmable Read-Only Memory */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: if_iwivar.h,v 1.6 2005/08/19 14:26:38 skrll Exp $ */
|
||||
/* $NetBSD: if_iwivar.h,v 1.7 2005/09/17 12:40:28 skrll Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2004, 2005
|
||||
|
|
@ -38,12 +38,12 @@ struct iwi_firmware {
|
|||
|
||||
struct iwi_rx_radiotap_header {
|
||||
struct ieee80211_radiotap_header wr_ihdr;
|
||||
u_int8_t wr_flags;
|
||||
u_int8_t wr_rate;
|
||||
u_int16_t wr_chan_freq;
|
||||
u_int16_t wr_chan_flags;
|
||||
u_int8_t wr_antsignal;
|
||||
u_int8_t wr_antenna;
|
||||
uint8_t wr_flags;
|
||||
uint8_t wr_rate;
|
||||
uint16_t wr_chan_freq;
|
||||
uint16_t wr_chan_flags;
|
||||
uint8_t wr_antsignal;
|
||||
uint8_t wr_antenna;
|
||||
};
|
||||
|
||||
#define IWI_RX_RADIOTAP_PRESENT \
|
||||
|
|
@ -55,9 +55,9 @@ struct iwi_rx_radiotap_header {
|
|||
|
||||
struct iwi_tx_radiotap_header {
|
||||
struct ieee80211_radiotap_header wt_ihdr;
|
||||
u_int8_t wt_flags;
|
||||
u_int16_t wt_chan_freq;
|
||||
u_int16_t wt_chan_flags;
|
||||
uint8_t wt_flags;
|
||||
uint16_t wt_chan_freq;
|
||||
uint16_t wt_chan_flags;
|
||||
};
|
||||
|
||||
#define IWI_TX_RADIOTAP_PRESENT \
|
||||
|
|
@ -110,7 +110,7 @@ struct iwi_softc {
|
|||
enum ieee80211_state, int);
|
||||
|
||||
struct iwi_firmware fw;
|
||||
u_int32_t flags;
|
||||
uint32_t flags;
|
||||
#define IWI_FLAG_FW_CACHED (1 << 0)
|
||||
#define IWI_FLAG_FW_INITED (1 << 1)
|
||||
#define IWI_FLAG_FW_WARNED (1 << 2)
|
||||
|
|
@ -145,14 +145,14 @@ struct iwi_softc {
|
|||
|
||||
union {
|
||||
struct iwi_rx_radiotap_header th;
|
||||
u_int8_t pad[64];
|
||||
uint8_t pad[64];
|
||||
} sc_rxtapu;
|
||||
#define sc_rxtap sc_rxtapu.th
|
||||
int sc_rxtap_len;
|
||||
|
||||
union {
|
||||
struct iwi_tx_radiotap_header th;
|
||||
u_int8_t pad[64];
|
||||
uint8_t pad[64];
|
||||
} sc_txtapu;
|
||||
#define sc_txtap sc_txtapu.th
|
||||
int sc_txtap_len;
|
||||
|
|
|
|||
Loading…
Reference in New Issue