PERFORCE change 106726 for review

[Attilio Rao]

http://perforce.freebsd.org/chv.cgi?CH=106726

Change 106726 by attilio at attilio_laptop on 2006/09/26 15:41:42

	Style-ize it

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/if_uralvar.h#8 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/if_uralvar.h#8 (text+ko) ====

@@ -17,70 +17,72 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#define URAL_N_TRANSFER 4
+
 struct ural_config_copy {
 	struct {
-	  u_int32_t		chan_to_ieee;
-	  u_int8_t		chan_is_2ghz;
+		uint32_t	chan_to_ieee;
+		uint8_t		chan_is_2ghz;
 	} ic_curchan;
 
 	struct {
-	  struct {
-	    u_int8_t		chan_is_5ghz;
-	  } ni_chan;
+		struct {
+			uint8_t		chan_is_5ghz;
+		} ni_chan;
 
-	  u_int16_t		ni_intval;
-	  u_int8_t		ni_bssid[IEEE80211_ADDR_LEN];
+		uint16_t	ni_intval;
+		uint8_t		ni_bssid[IEEE80211_ADDR_LEN];
 	} ic_bss;
 
 	struct {
-	  struct {
-	    ieee80211_keyix wk_keyix;
-	    u_int8_t wk_key[IEEE80211_KEYBUF_SIZE];
-	  } cs_nw_keys[IEEE80211_WEP_NKID];
+		struct {
+			ieee80211_keyix	wk_keyix;
+			uint8_t		wk_key[IEEE80211_KEYBUF_SIZE];
+		} cs_nw_keys[IEEE80211_WEP_NKID];
 	} ic_crypto;
 
 	enum ieee80211_opmode	ic_opmode;
 	enum ieee80211_state	ic_state;
-	u_int32_t		ic_flags;
-	u_int32_t		if_flags;
+	uint32_t		ic_flags;
+	uint32_t		if_flags;
 
-	u_int16_t		ic_txpowlimit;
-	u_int16_t		ic_curmode;
+	uint16_t		ic_txpowlimit;
+	uint16_t		ic_curmode;
 
-	u_int8_t		ic_myaddr[IEEE80211_ADDR_LEN];
+	uint8_t			ic_myaddr[IEEE80211_ADDR_LEN];
 };
 
 struct ural_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_antenna;
-	u_int8_t	wr_antsignal;
+	uint8_t		wr_flags;
+	uint8_t		wr_rate;
+	uint16_t	wr_chan_freq;
+	uint16_t	wr_chan_flags;
+	uint8_t		wr_antenna;
+	uint8_t		wr_antsignal;
 };
 
 #define RAL_RX_RADIOTAP_PRESENT						\
-	((1 << IEEE80211_RADIOTAP_FLAGS) |				\
-	 (1 << IEEE80211_RADIOTAP_RATE) |				\
-	 (1 << IEEE80211_RADIOTAP_CHANNEL) |				\
-	 (1 << IEEE80211_RADIOTAP_ANTENNA) |				\
-	 (1 << IEEE80211_RADIOTAP_DB_ANTSIGNAL))
+	    ((1 << IEEE80211_RADIOTAP_FLAGS) |				\
+	     (1 << IEEE80211_RADIOTAP_RATE) |				\
+	     (1 << IEEE80211_RADIOTAP_CHANNEL) |			\
+	     (1 << IEEE80211_RADIOTAP_ANTENNA) |			\
+	     (1 << IEEE80211_RADIOTAP_DB_ANTSIGNAL))
 
 struct ural_tx_radiotap_header {
 	struct ieee80211_radiotap_header wt_ihdr;
-	u_int8_t	wt_flags;
-	u_int8_t	wt_rate;
-	u_int16_t	wt_chan_freq;
-	u_int16_t	wt_chan_flags;
-	u_int8_t	wt_antenna;
+	uint8_t		wt_flags;
+	uint8_t		wt_rate;
+	uint16_t	wt_chan_freq;
+	uint16_t	wt_chan_flags;
+	uint8_t		wt_antenna;
 };
 
 #define RAL_TX_RADIOTAP_PRESENT						\
-	((1 << IEEE80211_RADIOTAP_FLAGS) |				\
-	 (1 << IEEE80211_RADIOTAP_RATE) |				\
-	 (1 << IEEE80211_RADIOTAP_CHANNEL) |				\
-	 (1 << IEEE80211_RADIOTAP_ANTENNA))
+	    ((1 << IEEE80211_RADIOTAP_FLAGS) |				\
+	     (1 << IEEE80211_RADIOTAP_RATE) |				\
+	     (1 << IEEE80211_RADIOTAP_CHANNEL) |			\
+	     (1 << IEEE80211_RADIOTAP_ANTENNA))
 
 struct ural_amrr {
 	int	txcnt;
@@ -92,21 +94,19 @@
 
 union ural_rxtap {
 	struct ural_rx_radiotap_header h;
-	u_int8_t pad[64];
+	uint8_t pad[64];
 };
 
 union ural_txtap {
 	struct ural_tx_radiotap_header h;
-	u_int8_t pad[64];
+	uint8_t pad[64];
 };
 
 struct ural_bbp_prom {
-	u_int8_t	val;
-	u_int8_t	reg;
+	uint8_t	val;
+	uint8_t	reg;
 } __packed;
 
-#define URAL_N_TRANSFER 4
-
 struct ural_softc {
 
 	struct usbd_config_td		sc_config_td;
@@ -129,41 +129,41 @@
 	struct usbd_device 		*sc_udev;
 
 	int (*sc_newstate)
-	  (struct ieee80211com *, enum ieee80211_state, int);
+	    (struct ieee80211com *, enum ieee80211_state, int);
 
 	enum ieee80211_state		sc_state;
 
-	u_int32_t			sc_bcn_flags;
-	u_int32_t			sc_unit;
-	u_int32_t			sc_asic_rev;
-	u_int32_t			sc_rf_regs[4];
+	uint32_t			sc_bcn_flags;
+	uint32_t			sc_unit;
+	uint32_t			sc_asic_rev;
+	uint32_t			sc_rf_regs[4];
 
-	u_int16_t			sc_flags;
-#define URAL_FLAG_READ_STALL		0x0001
-#define URAL_FLAG_WRITE_STALL		0x0002
-#define URAL_FLAG_SEND_BYTE_FRAME	0x0004
-#define URAL_FLAG_SEND_BCN_FRAME	0x0008
-#define URAL_FLAG_LL_READY		0x0010
-#define URAL_FLAG_HL_READY		0x0020
-#define URAL_FLAG_WAIT_COMMAND		0x0040
-	u_int16_t			sc_txtap_len;
-	u_int16_t			sc_rxtap_len;
-	u_int16_t			sc_sta[11];
-	u_int16_t			sc_bcn_rate;
+	uint16_t			sc_flags;
+#define	URAL_FLAG_READ_STALL		0x0001
+#define	URAL_FLAG_WRITE_STALL		0x0002
+#define	URAL_FLAG_SEND_BYTE_FRAME	0x0004
+#define	URAL_FLAG_SEND_BCN_FRAME	0x0008
+#define	URAL_FLAG_LL_READY		0x0010
+#define	URAL_FLAG_HL_READY		0x0020
+#define	URAL_FLAG_WAIT_COMMAND		0x0040
+	uint16_t			sc_txtap_len;
+	uint16_t			sc_rxtap_len;
+	uint16_t			sc_sta[11];
+	uint16_t			sc_bcn_rate;
 
-	u_int8_t			sc_rf_rev;
-	u_int8_t			sc_txpow[14];
-	u_int8_t			sc_led_mode;
-	u_int8_t			sc_hw_radio;
-	u_int8_t			sc_rx_ant;
-	u_int8_t			sc_tx_ant;
-	u_int8_t			sc_nb_ant;
-	u_int8_t			sc_if_timer;
-	u_int8_t			sc_tx_timer;
-	u_int8_t			sc_scan_timer;
-	u_int8_t			sc_amrr_timer;
-	u_int8_t			sc_name[32];
+	uint8_t				sc_rf_rev;
+	uint8_t				sc_txpow[14];
+	uint8_t				sc_led_mode;
+	uint8_t				sc_hw_radio;
+	uint8_t				sc_rx_ant;
+	uint8_t				sc_tx_ant;
+	uint8_t				sc_nb_ant;
+	uint8_t				sc_if_timer;
+	uint8_t				sc_tx_timer;
+	uint8_t				sc_scan_timer;
+	uint8_t				sc_amrr_timer;
+	uint8_t				sc_name[32];
 
-	u_int8_t			sc_wakeup_bcn;
+	uint8_t				sc_wakeup_bcn;
 };