Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e59fe083 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7d4df48e

drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h

+1 −1
Original line number Diff line number Diff line
@@ -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];

};

drivers/staging/brcm80211/include/bcmutils.h

+1 −1
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ extern "C" { 
	"bool", \

	"s8", \

	"u8", \

	"int16", \

	"s16", \

	"u16", \

	"int32", \

	"uint32", \

drivers/staging/brcm80211/include/qmath.h

+21 −21
Original line number Diff line number Diff line
@@ -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__ */

drivers/staging/brcm80211/include/typedefs.h

+1 −6
Original line number Diff line number Diff line
@@ -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



/*

drivers/staging/brcm80211/include/wlioctl.h

+4 −4
Original line number Diff line number Diff line
@@ -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;