summaryrefslogtreecommitdiff
path: root/sys/dev/pci/if_ipwvar.h
diff options
context:
space:
mode:
authorDamien Bergamini <damien@cvs.openbsd.org>2006-02-26 19:14:41 +0000
committerDamien Bergamini <damien@cvs.openbsd.org>2006-02-26 19:14:41 +0000
commitba8ced20582cbd7c75cd05573ff3b958256bbbc2 (patch)
tree6af9c628dead576a6d64769ea5b466d5949eb52b /sys/dev/pci/if_ipwvar.h
parent0d6a93a56c7107d7c5934924530237d8f092b384 (diff)
prettify + u_int{8,16,32}_t -> uint{8,16,32}_t
Diffstat (limited to 'sys/dev/pci/if_ipwvar.h')
-rw-r--r--sys/dev/pci/if_ipwvar.h34
1 files changed, 17 insertions, 17 deletions
diff --git a/sys/dev/pci/if_ipwvar.h b/sys/dev/pci/if_ipwvar.h
index b04a2b3b1f5..333f7446afc 100644
--- a/sys/dev/pci/if_ipwvar.h
+++ b/sys/dev/pci/if_ipwvar.h
@@ -1,7 +1,7 @@
-/* $OpenBSD: if_ipwvar.h,v 1.12 2005/03/12 13:37:49 damien Exp $ */
+/* $OpenBSD: if_ipwvar.h,v 1.13 2006/02/26 19:14:40 damien Exp $ */
/*-
- * Copyright (c) 2004, 2005
+ * Copyright (c) 2004-2006
* Damien Bergamini <damien.bergamini@free.fr>. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -60,10 +60,10 @@ struct ipw_soft_buf {
struct ipw_rx_radiotap_header {
struct ieee80211_radiotap_header wr_ihdr;
- u_int8_t wr_flags;
- u_int16_t wr_chan_freq;
- u_int16_t wr_chan_flags;
- u_int8_t wr_antsignal;
+ uint8_t wr_flags;
+ uint16_t wr_chan_freq;
+ uint16_t wr_chan_flags;
+ uint8_t wr_antsignal;
} __packed;
#define IPW_RX_RADIOTAP_PRESENT \
@@ -73,9 +73,9 @@ struct ipw_rx_radiotap_header {
struct ipw_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;
} __packed;
#define IPW_TX_RADIOTAP_PRESENT \
@@ -91,7 +91,7 @@ struct ipw_softc {
int (*sc_newstate)(struct ieee80211com *,
enum ieee80211_state, int);
- u_int32_t flags;
+ uint32_t flags;
#define IPW_FLAG_FW_INITED (1 << 0)
struct resource *irq;
@@ -133,12 +133,12 @@ struct ipw_softc {
SLIST_HEAD(, ipw_soft_hdr) free_shdr;
SLIST_HEAD(, ipw_soft_buf) free_sbuf;
- u_int32_t table1_base;
- u_int32_t table2_base;
+ uint32_t table1_base;
+ uint32_t table2_base;
- u_int32_t txcur;
- u_int32_t txold;
- u_int32_t rxcur;
+ uint32_t txcur;
+ uint32_t txold;
+ uint32_t rxcur;
int txfree;
void *powerhook;
@@ -148,14 +148,14 @@ struct ipw_softc {
union {
struct ipw_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 ipw_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;