Staging: brcm80211: include: s/uint8/u8/ (de9bca63) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/staging/brcm80211/include/bcm_rpc_tp.h

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -106,16 +106,16 @@ extern void bcm_rpc_tp_txflowctl(rpc_tp_info_t *rpcb, bool state, int prio);
	extern void bcm_rpc_tp_txflowctlcb_init(rpc_tp_info_t rpc_th, void ctx,		extern void bcm_rpc_tp_txflowctlcb_init(rpc_tp_info_t rpc_th, void ctx,
	rpc_txflowctl_cb_t cb);		rpc_txflowctl_cb_t cb);
	extern void bcm_rpc_tp_txflowctlcb_deinit(rpc_tp_info_t *rpc_th);		extern void bcm_rpc_tp_txflowctlcb_deinit(rpc_tp_info_t *rpc_th);
	extern void bcm_rpc_tp_txq_wm_set(rpc_tp_info_t *rpc_th, uint8 hiwm,		extern void bcm_rpc_tp_txq_wm_set(rpc_tp_info_t *rpc_th, u8 hiwm,
	uint8 lowm);		u8 lowm);
	extern void bcm_rpc_tp_txq_wm_get(rpc_tp_info_t rpc_th, uint8 hiwm,		extern void bcm_rpc_tp_txq_wm_get(rpc_tp_info_t rpc_th, u8 hiwm,
	uint8 *lowm);		u8 *lowm);
	#endif /* WLC_LOW */		#endif /* WLC_LOW */

	extern void bcm_rpc_tp_agg_set(rpc_tp_info_t *rpcb, uint32 reason, bool set);		extern void bcm_rpc_tp_agg_set(rpc_tp_info_t *rpcb, uint32 reason, bool set);
	extern void bcm_rpc_tp_agg_limit_set(rpc_tp_info_t *rpc_th, uint8 sf,		extern void bcm_rpc_tp_agg_limit_set(rpc_tp_info_t *rpc_th, u8 sf,
	uint16 bytes);		uint16 bytes);
	extern void bcm_rpc_tp_agg_limit_get(rpc_tp_info_t rpc_th, uint8 sf,		extern void bcm_rpc_tp_agg_limit_get(rpc_tp_info_t rpc_th, u8 sf,
	uint16 *bytes);		uint16 *bytes);

	#define BCM_RPC_TP_MSG_LEVEL_MASK 0x00ff		#define BCM_RPC_TP_MSG_LEVEL_MASK 0x00ff
	@@ -131,7 +131,7 @@ extern void bcm_rpc_tp_agg_limit_get(rpc_tp_info_t rpc_th, uint8 sf,
	#define RPC_TP_MSG_HOST_AGG_VAL 0x0004 /* DNGL TP agg msg */		#define RPC_TP_MSG_HOST_AGG_VAL 0x0004 /* DNGL TP agg msg */
	#define RPC_TP_MSG_HOST_DEA_VAL 0x0008 /* DNGL TP deag msg */		#define RPC_TP_MSG_HOST_DEA_VAL 0x0008 /* DNGL TP deag msg */

	extern void bcm_rpc_tp_msglevel_set(rpc_tp_info_t *rpc_th, uint8 msglevel,		extern void bcm_rpc_tp_msglevel_set(rpc_tp_info_t *rpc_th, u8 msglevel,
	bool high_low);		bool high_low);

	#endif /* _bcm_rpc_tp_h_ */		#endif /* _bcm_rpc_tp_h_ */

drivers/staging/brcm80211/include/bcm_xdr.h

+4 −4

drivers/staging/brcm80211/include/bcmcdc.h

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -90,9 +90,9 @@ typedef struct cdc_ioctl {
	((idx) << BDC_FLAG2_IF_SHIFT)))		((idx) << BDC_FLAG2_IF_SHIFT)))

	struct bdc_header {		struct bdc_header {
	uint8 flags; /* Flags */		u8 flags; /* Flags */
	uint8 priority; /* 802.1d Priority 0:2 bits, 4:7 flow		u8 priority; /* 802.1d Priority 0:2 bits, 4:7 flow
	control info for usb */		control info for usb */
	uint8 flags2;		u8 flags2;
	uint8 rssi;		u8 rssi;
	};		};

drivers/staging/brcm80211/include/bcmendian.h

+24 −24

Original line number	Original line	Diff line number	Diff line
	@@ -105,16 +105,16 @@
	#define _NTOH32_UA(cp) (((cp)[0] << 24) \| ((cp)[1] << 16) \| ((cp)[2] << 8) \| (cp)[3])		#define _NTOH32_UA(cp) (((cp)[0] << 24) \| ((cp)[1] << 16) \| ((cp)[2] << 8) \| (cp)[3])

	#define ltoh_ua(ptr) \		#define ltoh_ua(ptr) \
	(sizeof((ptr)) == sizeof(uint8) ? (const uint8 *)(ptr) : \		(sizeof((ptr)) == sizeof(u8) ? (const u8 *)(ptr) : \
	sizeof((ptr)) == sizeof(uint16) ? _LTOH16_UA((const uint8 )(ptr)) : \		sizeof((ptr)) == sizeof(uint16) ? _LTOH16_UA((const u8 )(ptr)) : \
	sizeof((ptr)) == sizeof(uint32) ? _LTOH32_UA((const uint8 )(ptr)) : \		sizeof((ptr)) == sizeof(uint32) ? _LTOH32_UA((const u8 )(ptr)) : \
	(uint8 )0)		(u8 )0)

	#define ntoh_ua(ptr) \		#define ntoh_ua(ptr) \
	(sizeof((ptr)) == sizeof(uint8) ? (const uint8 *)(ptr) : \		(sizeof((ptr)) == sizeof(u8) ? (const u8 *)(ptr) : \
	sizeof((ptr)) == sizeof(uint16) ? _NTOH16_UA((const uint8 )(ptr)) : \		sizeof((ptr)) == sizeof(uint16) ? _NTOH16_UA((const u8 )(ptr)) : \
	sizeof((ptr)) == sizeof(uint32) ? _NTOH32_UA((const uint8 )(ptr)) : \		sizeof((ptr)) == sizeof(uint32) ? _NTOH32_UA((const u8 )(ptr)) : \
	(uint8 )0)		(u8 )0)

	#ifdef __GNUC__		#ifdef __GNUC__

	@@ -148,14 +148,14 @@

	#define htol16_ua_store(val, bytes) ({ \		#define htol16_ua_store(val, bytes) ({ \
	uint16 _val = (val); \		uint16 _val = (val); \
	uint8 _bytes = (uint8 )(bytes); \		u8 _bytes = (u8 )(bytes); \
	_bytes[0] = _val & 0xff; \		_bytes[0] = _val & 0xff; \
	_bytes[1] = _val >> 8; \		_bytes[1] = _val >> 8; \
	})		})

	#define htol32_ua_store(val, bytes) ({ \		#define htol32_ua_store(val, bytes) ({ \
	uint32 _val = (val); \		uint32 _val = (val); \
	uint8 _bytes = (uint8 )(bytes); \		u8 _bytes = (u8 )(bytes); \
	_bytes[0] = _val & 0xff; \		_bytes[0] = _val & 0xff; \
	_bytes[1] = (_val >> 8) & 0xff; \		_bytes[1] = (_val >> 8) & 0xff; \
	_bytes[2] = (_val >> 16) & 0xff; \		_bytes[2] = (_val >> 16) & 0xff; \
	@@ -164,14 +164,14 @@

	#define hton16_ua_store(val, bytes) ({ \		#define hton16_ua_store(val, bytes) ({ \
	uint16 _val = (val); \		uint16 _val = (val); \
	uint8 _bytes = (uint8 )(bytes); \		u8 _bytes = (u8 )(bytes); \
	_bytes[0] = _val >> 8; \		_bytes[0] = _val >> 8; \
	_bytes[1] = _val & 0xff; \		_bytes[1] = _val & 0xff; \
	})		})

	#define hton32_ua_store(val, bytes) ({ \		#define hton32_ua_store(val, bytes) ({ \
	uint32 _val = (val); \		uint32 _val = (val); \
	uint8 _bytes = (uint8 )(bytes); \		u8 _bytes = (u8 )(bytes); \
	_bytes[0] = _val >> 24; \		_bytes[0] = _val >> 24; \
	_bytes[1] = (_val >> 16) & 0xff; \		_bytes[1] = (_val >> 16) & 0xff; \
	_bytes[2] = (_val >> 8) & 0xff; \		_bytes[2] = (_val >> 8) & 0xff; \
	@@ -179,22 +179,22 @@
	})		})

	#define ltoh16_ua(bytes) ({ \		#define ltoh16_ua(bytes) ({ \
	const uint8 _bytes = (const uint8 )(bytes); \		const u8 _bytes = (const u8 )(bytes); \
	_LTOH16_UA(_bytes); \		_LTOH16_UA(_bytes); \
	})		})

	#define ltoh32_ua(bytes) ({ \		#define ltoh32_ua(bytes) ({ \
	const uint8 _bytes = (const uint8 )(bytes); \		const u8 _bytes = (const u8 )(bytes); \
	_LTOH32_UA(_bytes); \		_LTOH32_UA(_bytes); \
	})		})

	#define ntoh16_ua(bytes) ({ \		#define ntoh16_ua(bytes) ({ \
	const uint8 _bytes = (const uint8 )(bytes); \		const u8 _bytes = (const u8 )(bytes); \
	_NTOH16_UA(_bytes); \		_NTOH16_UA(_bytes); \
	})		})

	#define ntoh32_ua(bytes) ({ \		#define ntoh32_ua(bytes) ({ \
	const uint8 _bytes = (const uint8 )(bytes); \		const u8 _bytes = (const u8 )(bytes); \
	_NTOH32_UA(_bytes); \		_NTOH32_UA(_bytes); \
	})		})

	@@ -232,7 +232,7 @@ static inline void bcmswap16_buf(uint16 *buf, uint len)
	/*		/*
	* Store 16-bit value to unaligned little-endian byte array.		* Store 16-bit value to unaligned little-endian byte array.
	*/		*/
	static inline void htol16_ua_store(uint16 val, uint8 *bytes)		static inline void htol16_ua_store(uint16 val, u8 *bytes)
	{		{
	bytes[0] = val & 0xff;		bytes[0] = val & 0xff;
	bytes[1] = val >> 8;		bytes[1] = val >> 8;
	@@ -241,7 +241,7 @@ static inline void htol16_ua_store(uint16 val, uint8 *bytes)
	/*		/*
	* Store 32-bit value to unaligned little-endian byte array.		* Store 32-bit value to unaligned little-endian byte array.
	*/		*/
	static inline void htol32_ua_store(uint32 val, uint8 *bytes)		static inline void htol32_ua_store(uint32 val, u8 *bytes)
	{		{
	bytes[0] = val & 0xff;		bytes[0] = val & 0xff;
	bytes[1] = (val >> 8) & 0xff;		bytes[1] = (val >> 8) & 0xff;
	@@ -252,7 +252,7 @@ static inline void htol32_ua_store(uint32 val, uint8 *bytes)
	/*		/*
	* Store 16-bit value to unaligned network-(big-)endian byte array.		* Store 16-bit value to unaligned network-(big-)endian byte array.
	*/		*/
	static inline void hton16_ua_store(uint16 val, uint8 *bytes)		static inline void hton16_ua_store(uint16 val, u8 *bytes)
	{		{
	bytes[0] = val >> 8;		bytes[0] = val >> 8;
	bytes[1] = val & 0xff;		bytes[1] = val & 0xff;
	@@ -261,7 +261,7 @@ static inline void hton16_ua_store(uint16 val, uint8 *bytes)
	/*		/*
	* Store 32-bit value to unaligned network-(big-)endian byte array.		* Store 32-bit value to unaligned network-(big-)endian byte array.
	*/		*/
	static inline void hton32_ua_store(uint32 val, uint8 *bytes)		static inline void hton32_ua_store(uint32 val, u8 *bytes)
	{		{
	bytes[0] = val >> 24;		bytes[0] = val >> 24;
	bytes[1] = (val >> 16) & 0xff;		bytes[1] = (val >> 16) & 0xff;
	@@ -274,7 +274,7 @@ static inline void hton32_ua_store(uint32 val, uint8 *bytes)
	*/		*/
	static inline uint16 ltoh16_ua(const void *bytes)		static inline uint16 ltoh16_ua(const void *bytes)
	{		{
	return _LTOH16_UA((const uint8 *)bytes);		return _LTOH16_UA((const u8 *)bytes);
	}		}

	/*		/*
	@@ -282,7 +282,7 @@ static inline uint16 ltoh16_ua(const void *bytes)
	*/		*/
	static inline uint32 ltoh32_ua(const void *bytes)		static inline uint32 ltoh32_ua(const void *bytes)
	{		{
	return _LTOH32_UA((const uint8 *)bytes);		return _LTOH32_UA((const u8 *)bytes);
	}		}

	/*		/*
	@@ -290,7 +290,7 @@ static inline uint32 ltoh32_ua(const void *bytes)
	*/		*/
	static inline uint16 ntoh16_ua(const void *bytes)		static inline uint16 ntoh16_ua(const void *bytes)
	{		{
	return _NTOH16_UA((const uint8 *)bytes);		return _NTOH16_UA((const u8 *)bytes);
	}		}

	/*		/*
	@@ -298,7 +298,7 @@ static inline uint16 ntoh16_ua(const void *bytes)
	*/		*/
	static inline uint32 ntoh32_ua(const void *bytes)		static inline uint32 ntoh32_ua(const void *bytes)
	{		{
	return _NTOH32_UA((const uint8 *)bytes);		return _NTOH32_UA((const u8 *)bytes);
	}		}

	#endif /* !__GNUC__ */		#endif /* !__GNUC__ */

drivers/staging/brcm80211/include/bcmnvram.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -150,7 +150,7 @@ extern int nvram_getall(char *nvram_buf, int count);
	* returns the crc value of the nvram		* returns the crc value of the nvram
	* @param nvh nvram header pointer		* @param nvh nvram header pointer
	*/		*/
	uint8 nvram_calc_crc(struct nvram_header *nvh);		u8 nvram_calc_crc(struct nvram_header *nvh);

	#endif /* _LANGUAGE_ASSEMBLY */		#endif /* _LANGUAGE_ASSEMBLY */

Original line number	Original line	Diff line number	Diff line
	@@ -25,9 +25,9 @@
	*		*
	*/		*/
	typedef struct {		typedef struct {
	uint8 buf; / pointer to current position in origbuf */		u8 buf; / pointer to current position in origbuf */
	uint size; /* current (residual) size in bytes */		uint size; /* current (residual) size in bytes */
	uint8 origbuf; / unmodified pointer to orignal buffer */		u8 origbuf; / unmodified pointer to orignal buffer */
	uint origsize; /* unmodified orignal buffer size in bytes */		uint origsize; /* unmodified orignal buffer size in bytes */
	} bcm_xdr_buf_t;		} bcm_xdr_buf_t;

	@@ -47,8 +47,8 @@ int bcm_xdr_unpack_opaque_varlen(bcm_xdr_buf_t b, uint plen, void **pdata);
	int bcm_xdr_pack_string(bcm_xdr_buf_t b, char str);		int bcm_xdr_pack_string(bcm_xdr_buf_t b, char str);
	int bcm_xdr_unpack_string(bcm_xdr_buf_t b, uint plen, char **pstr);		int bcm_xdr_unpack_string(bcm_xdr_buf_t b, uint plen, char **pstr);

	int bcm_xdr_pack_uint8_vec(bcm_xdr_buf_t , uint8 vec, uint32 elems);		int bcm_xdr_pack_u8_vec(bcm_xdr_buf_t , u8 vec, uint32 elems);
	int bcm_xdr_unpack_uint8_vec(bcm_xdr_buf_t , uint8 vec, uint32 elems);		int bcm_xdr_unpack_u8_vec(bcm_xdr_buf_t , u8 vec, uint32 elems);
	int bcm_xdr_pack_uint16_vec(bcm_xdr_buf_t b, uint len, void vec);		int bcm_xdr_pack_uint16_vec(bcm_xdr_buf_t b, uint len, void vec);
	int bcm_xdr_unpack_uint16_vec(bcm_xdr_buf_t b, uint len, void vec);		int bcm_xdr_unpack_uint16_vec(bcm_xdr_buf_t b, uint len, void vec);
	int bcm_xdr_pack_uint32_vec(bcm_xdr_buf_t b, uint len, void vec);		int bcm_xdr_pack_uint32_vec(bcm_xdr_buf_t b, uint len, void vec);