Staging: brcm80211: s/int16/s16/

Use the kernel types, don't invent your own. Cc: Brett Rudley <brudley@broadcom.com> Cc: Henry Ptasinski <henryp@broadcom.com> Cc: Nohee Ko <noheek@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
mariux64 · Oct 8, 2010 · e59fe08 · e59fe08
1 parent 7d4df48
commit e59fe08
Show file tree

Hide file tree

Showing 18 changed files with 270 additions and 275 deletions.
diff --git a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
@@ -182,7 +182,7 @@ struct wl_dev {
 struct wl_cfg80211_bss_info {
 	u16 band;
 	u16 channel;
-	int16 rssi;
+	s16 rssi;
 	u16 frame_len;
 	u8 frame_buf[1];
 };

diff --git a/drivers/staging/brcm80211/include/bcmutils.h b/drivers/staging/brcm80211/include/bcmutils.h
@@ -324,7 +324,7 @@ extern "C" {
 	"bool", \
 	"s8", \
 	"u8", \
-	"int16", \
+	"s16", \
 	"u16", \
 	"int32", \
 	"uint32", \

diff --git a/drivers/staging/brcm80211/include/qmath.h b/drivers/staging/brcm80211/include/qmath.h
@@ -19,62 +19,62 @@
 
 #include <typedefs.h>
 
-int16 qm_sat32(int32 op);
+s16 qm_sat32(int32 op);
 
-int32 qm_mul321616(int16 op1, int16 op2);
+int32 qm_mul321616(s16 op1, s16 op2);
 
-int16 qm_mul16(int16 op1, int16 op2);
+s16 qm_mul16(s16 op1, s16 op2);
 
-int32 qm_muls321616(int16 op1, int16 op2);
+int32 qm_muls321616(s16 op1, s16 op2);
 
 u16 qm_mulu16(u16 op1, u16 op2);
 
-int16 qm_muls16(int16 op1, int16 op2);
+s16 qm_muls16(s16 op1, s16 op2);
 
 int32 qm_add32(int32 op1, int32 op2);
 
-int16 qm_add16(int16 op1, int16 op2);
+s16 qm_add16(s16 op1, s16 op2);
 
-int16 qm_sub16(int16 op1, int16 op2);
+s16 qm_sub16(s16 op1, s16 op2);
 
 int32 qm_sub32(int32 op1, int32 op2);
 
-int32 qm_mac321616(int32 acc, int16 op1, int16 op2);
+int32 qm_mac321616(int32 acc, s16 op1, s16 op2);
 
 int32 qm_shl32(int32 op, int shift);
 
 int32 qm_shr32(int32 op, int shift);
 
-int16 qm_shl16(int16 op, int shift);
+s16 qm_shl16(s16 op, int shift);
 
-int16 qm_shr16(int16 op, int shift);
+s16 qm_shr16(s16 op, int shift);
 
-int16 qm_norm16(int16 op);
+s16 qm_norm16(s16 op);
 
-int16 qm_norm32(int32 op);
+s16 qm_norm32(int32 op);
 
-int16 qm_div_s(int16 num, int16 denom);
+s16 qm_div_s(s16 num, s16 denom);
 
-int16 qm_abs16(int16 op);
+s16 qm_abs16(s16 op);
 
-int16 qm_div16(int16 num, int16 denom, int16 *qQuotient);
+s16 qm_div16(s16 num, s16 denom, s16 *qQuotient);
 
 int32 qm_abs32(int32 op);
 
-int16 qm_div163232(int32 num, int32 denom, int16 *qquotient);
+s16 qm_div163232(int32 num, int32 denom, s16 *qquotient);
 
-int32 qm_mul323216(int32 op1, int16 op2);
+int32 qm_mul323216(int32 op1, s16 op2);
 
-int32 qm_mulsu321616(int16 op1, u16 op2);
+int32 qm_mulsu321616(s16 op1, u16 op2);
 
-int32 qm_muls323216(int32 op1, int16 op2);
+int32 qm_muls323216(int32 op1, s16 op2);
 
 int32 qm_mul32(int32 a, int32 b);
 
 int32 qm_muls32(int32 a, int32 b);
 
-void qm_log10(int32 N, int16 qN, int16 *log10N, int16 *qLog10N);
+void qm_log10(int32 N, s16 qN, s16 *log10N, s16 *qLog10N);
 
-void qm_1byN(int32 N, int16 qN, int32 *result, int16 *qResult);
+void qm_1byN(int32 N, s16 qN, int32 *result, s16 *qResult);
 
 #endif				/* #ifndef __QMATH_H__ */
diff --git a/drivers/staging/brcm80211/include/typedefs.h b/drivers/staging/brcm80211/include/typedefs.h
@@ -42,7 +42,7 @@ typedef unsigned long long int uintptr;
 typedef unsigned int uint;
 #endif
 
-/* define [u]int16/32/64, uintptr */
+/* define [u]int32/64, uintptr */
 
 #ifndef TYPEDEF_UINT32
 typedef unsigned int uint32;
@@ -52,10 +52,6 @@ typedef unsigned int uint32;
 typedef unsigned int uintptr;
 #endif
 
-#ifndef TYPEDEF_INT16
-typedef signed short int16;
-#endif
-
 #ifndef TYPEDEF_INT32
 typedef signed int int32;
 #endif
@@ -83,7 +79,6 @@ typedef signed int int32;
 #undef TYPEDEF_UINT
 #undef TYPEDEF_UINT32
 #undef TYPEDEF_UINTPTR
-#undef TYPEDEF_INT16
 #undef TYPEDEF_INT32
 
 /*

diff --git a/drivers/staging/brcm80211/include/wlioctl.h b/drivers/staging/brcm80211/include/wlioctl.h
@@ -55,7 +55,7 @@ typedef struct wl_bss_info_107 {
 	u8 channel;		/* Channel no. */
 	u16 atim_window;	/* units are Kusec */
 	u8 dtim_period;	/* DTIM period */
-	int16 RSSI;		/* receive signal strength (in dBm) */
+	s16 RSSI;		/* receive signal strength (in dBm) */
 	s8 phy_noise;		/* noise (in dBm) */
 	uint32 ie_length;	/* byte length of Information Elements */
 	/* variable length Information Elements */
@@ -88,7 +88,7 @@ typedef struct wl_bss_info_108 {
 	chanspec_t chanspec;	/* chanspec for bss */
 	u16 atim_window;	/* units are Kusec */
 	u8 dtim_period;	/* DTIM period */
-	int16 RSSI;		/* receive signal strength (in dBm) */
+	s16 RSSI;		/* receive signal strength (in dBm) */
 	s8 phy_noise;		/* noise (in dBm) */
 
 	u8 n_cap;		/* BSS is 802.11N Capable */
@@ -132,7 +132,7 @@ typedef struct wl_bss_info {
 	chanspec_t chanspec;	/* chanspec for bss */
 	u16 atim_window;	/* units are Kusec */
 	u8 dtim_period;	/* DTIM period */
-	int16 RSSI;		/* receive signal strength (in dBm) */
+	s16 RSSI;		/* receive signal strength (in dBm) */
 	s8 phy_noise;		/* noise (in dBm) */
 
 	u8 n_cap;		/* BSS is 802.11N Capable */
@@ -145,7 +145,7 @@ typedef struct wl_bss_info {
 
 	u16 ie_offset;	/* offset at which IEs start, from beginning */
 	uint32 ie_length;	/* byte length of Information Elements */
-	int16 SNR;		/* average SNR of during frame reception */
+	s16 SNR;		/* average SNR of during frame reception */
 	/* Add new fields here */
 	/* variable length Information Elements */
 } wl_bss_info_t;

diff --git a/drivers/staging/brcm80211/phy/wlc_phy_cmn.c b/drivers/staging/brcm80211/phy/wlc_phy_cmn.c
@@ -2274,7 +2274,7 @@ static uint32 wlc_phy_txpower_est_power_nphy(phy_info_t *pi);
 
 static uint32 wlc_phy_txpower_est_power_nphy(phy_info_t *pi)
 {
-	int16 tx0_status, tx1_status;
+	s16 tx0_status, tx1_status;
 	u16 estPower1, estPower2;
 	u8 pwr0, pwr1, adj_pwr0, adj_pwr1;
 	uint32 est_pwr;
@@ -3119,8 +3119,8 @@ static void wlc_phy_cal_perical_mphase_schedule(phy_info_t *pi, uint delay)
 
 void wlc_phy_cal_perical(wlc_phy_t *pih, u8 reason)
 {
-	int16 nphy_currtemp = 0;
-	int16 delta_temp = 0;
+	s16 nphy_currtemp = 0;
+	s16 delta_temp = 0;
 	bool do_periodic_cal = TRUE;
 	phy_info_t *pi = (phy_info_t *) pih;
 
@@ -3171,7 +3171,7 @@ void wlc_phy_cal_perical(wlc_phy_t *pih, u8 reason)
 			    nphy_currtemp - pi->nphy_lastcal_temp :
 			    pi->nphy_lastcal_temp - nphy_currtemp;
 
-			if ((delta_temp < (int16) pi->phycal_tempdelta) &&
+			if ((delta_temp < (s16) pi->phycal_tempdelta) &&
 			    (pi->nphy_txiqlocal_chanspec ==
 			     pi->radio_chanspec)) {
 				do_periodic_cal = FALSE;
@@ -3271,7 +3271,7 @@ void wlc_phy_stf_chain_get(wlc_phy_t *pih, u8 *txchain, u8 *rxchain)
 
 u8 wlc_phy_stf_chain_active_get(wlc_phy_t *pih)
 {
-	int16 nphy_currtemp;
+	s16 nphy_currtemp;
 	u8 active_bitmap;
 	phy_info_t *pi = (phy_info_t *) pih;