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

Commit ca356ada authored by Chaehyun Lim's avatar Chaehyun Lim Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: remove WILC_Sint8 



Use s8 instead of WILC_Sint8.

Signed-off-by: default avatarChaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 57b298f5

drivers/staging/wilc1000/coreconfigurator.c

+9 −9
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ typedef struct { 
/*****************************************************************************/

/* Extern Function Declarations                                              */

/*****************************************************************************/

extern WILC_Sint32 SendRawPacket(WILC_Sint8 *ps8Packet, WILC_Sint32 s32PacketLen);

extern WILC_Sint32 SendRawPacket(s8 *ps8Packet, WILC_Sint32 s32PacketLen);

extern void NetworkInfoReceived(u8 *pu8Buffer, u32 u32Length);

extern void GnrlAsyncInfoReceived(u8 *pu8Buffer, u32 u32Length);

extern void host_int_ScanCompleteReceived(u8 *pu8Buffer, u32 u32Length);
@@ -168,7 +168,7 @@ extern void host_int_ScanCompleteReceived(u8 *pu8Buffer, u32 u32Length); 
static struct semaphore SemHandleSendPkt;

static struct semaphore SemHandlePktResp;



static WILC_Sint8 *gps8ConfigPacket;

static s8 *gps8ConfigPacket;



static tstrConfigPktInfo gstrConfigPktInfo;
@@ -678,7 +678,7 @@ WILC_Sint32 CoreConfiguratorInit(void) 
	sema_init(&SemHandleSendPkt, 1);

	sema_init(&SemHandlePktResp, 0);



	gps8ConfigPacket = (WILC_Sint8 *)WILC_MALLOC(MAX_PACKET_BUFF_SIZE);

	gps8ConfigPacket = (s8 *)WILC_MALLOC(MAX_PACKET_BUFF_SIZE);

	if (gps8ConfigPacket == NULL) {

		PRINT_ER("failed in gps8ConfigPacket allocation\n");

		s32Error = WILC_NO_MEM;
@@ -1097,7 +1097,7 @@ WILC_Sint32 DeallocateSurveyResults(wid_site_survey_reslts_s *pstrSurveyResults) 
/*****************************************************************************/



void ProcessCharWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen,

		    tstrWID *pstrWID, WILC_Sint8 *ps8WidVal)

		    tstrWID *pstrWID, s8 *ps8WidVal)

{

	u8 *pu8val = (u8 *)ps8WidVal;

	u8 u8val = 0;
@@ -1151,7 +1151,7 @@ void ProcessCharWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen, 
/*****************************************************************************/



void ProcessShortWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen,

		     tstrWID *pstrWID, WILC_Sint8 *ps8WidVal)

		     tstrWID *pstrWID, s8 *ps8WidVal)

{

	u16 *pu16val = (u16 *)ps8WidVal;

	u16 u16val = 0;
@@ -1206,7 +1206,7 @@ void ProcessShortWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen, 
/*****************************************************************************/



void ProcessIntWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen,

		   tstrWID *pstrWID, WILC_Sint8 *ps8WidVal)

		   tstrWID *pstrWID, s8 *ps8WidVal)

{

	u32 *pu32val = (u32 *)ps8WidVal;

	u32 u32val = 0;
@@ -1551,7 +1551,7 @@ WILC_Sint32 further_process_response(u8 *resp, 
		u16 *pu16val = (u16 *)(pstrWIDresult->ps8WidVal);

		cfg_sht = MAKE_WORD16(resp[idx], resp[idx + 1]);

		/*Set local copy of WID*/

		/* pstrWIDresult->ps8WidVal = (WILC_Sint8*)(WILC_Sint32)cfg_sht; */

		/* pstrWIDresult->ps8WidVal = (s8*)(WILC_Sint32)cfg_sht; */

		*pu16val = cfg_sht;

		break;

	}
@@ -1564,7 +1564,7 @@ WILC_Sint32 further_process_response(u8 *resp, 
				MAKE_WORD16(resp[idx + 2], resp[idx + 3])

				);

		/*Set local copy of WID*/

		/* pstrWIDresult->ps8WidVal = (WILC_Sint8*)cfg_int; */

		/* pstrWIDresult->ps8WidVal = (s8*)cfg_int; */

		*pu32val = cfg_int;

		break;

	}
@@ -1857,7 +1857,7 @@ WILC_Sint32 CreatePacketHeader(WILC_Char *pcpacket, WILC_Sint32 *ps32PacketLengt 
 *  @version	1.0

 */



WILC_Sint32 CreateConfigPacket(WILC_Sint8 *ps8packet, WILC_Sint32 *ps32PacketLength,

WILC_Sint32 CreateConfigPacket(s8 *ps8packet, WILC_Sint32 *ps32PacketLength,

			       tstrWID *pstrWIDs, u32 u32WIDsCount)

{

	WILC_Sint32 s32Error = WILC_SUCCESS;

drivers/staging/wilc1000/coreconfigurator.h

+4 −4
Original line number Diff line number Diff line
@@ -397,18 +397,18 @@ typedef struct { 
	u16 u16WIDid;

	tenuWIDtype enuWIDtype;

	WILC_Sint32 s32ValueSize;

	WILC_Sint8      *ps8WidVal;

	s8      *ps8WidVal;



} tstrWID;



typedef struct {

	u8 u8Full;

	u8 u8Index;

	WILC_Sint8 as8RSSI[NUM_RSSI];

	s8 as8RSSI[NUM_RSSI];

} tstrRSSI;

/* This structure is used to support parsing of the received 'N' message */

typedef struct {

	WILC_Sint8 s8rssi;

	s8 s8rssi;

	u16 u16CapInfo;

	u8 au8ssid[MAX_SSID_LEN];

	u8 u8SsidLen;
@@ -490,7 +490,7 @@ extern WILC_Sint32 ParseSurveyResults(u8 ppu8RcvdSiteSurveyResults[][MAX_SURVEY_ 
extern WILC_Sint32 DeallocateSurveyResults(wid_site_survey_reslts_s *pstrSurveyResults);

#endif



extern WILC_Sint32 SendRawPacket(WILC_Sint8 *pspacket, WILC_Sint32 s32PacketLen);

extern WILC_Sint32 SendRawPacket(s8 *pspacket, WILC_Sint32 s32PacketLen);

extern void NetworkInfoReceived(u8 *pu8Buffer, u32 u32Length);

void GnrlAsyncInfoReceived(u8 *pu8Buffer, u32 u32Length);

void host_int_ScanCompleteReceived(u8 *pu8Buffer, u32 u32Length);

drivers/staging/wilc1000/host_interface.c

+74 −74

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/wilc1000/host_interface.h

+6 −6
Original line number Diff line number Diff line
@@ -128,12 +128,12 @@ typedef enum {WID_CHAR = 0, 
typedef struct {

	u16 cfg_wid;

	WID_TYPE_T cfg_type;

	WILC_Sint8     *pu8Para;

	s8     *pu8Para;

} cfg_param_t;



typedef struct _tstrStatistics {

	u8 u8LinkSpeed;

	WILC_Sint8 s8RSSI;

	s8 s8RSSI;

	u32 u32TxCount;

	u32 u32RxCount;

	u32 u32TxFailureCount;
@@ -237,7 +237,7 @@ typedef enum { 


typedef struct {

	u8 au8bssid[6];

	WILC_Sint8 s8rssi;

	s8 s8rssi;

} tstrFoundNetworkInfo;



typedef enum {SCAN_EVENT_NETWORK_FOUND  = 0,
@@ -989,8 +989,8 @@ WILC_Sint32 host_int_get_host_chnl_num(WILC_WFIDrvHandle hWFIDrv, u8 *pu8ChNo); 
 *  @date		8 March 2012

 *  @version		1.0

 */

WILC_Sint32 host_int_get_rssi(WILC_WFIDrvHandle hWFIDrv, WILC_Sint8 *ps8Rssi);

WILC_Sint32 host_int_get_link_speed(WILC_WFIDrvHandle hWFIDrv, WILC_Sint8 *ps8lnkspd);

WILC_Sint32 host_int_get_rssi(WILC_WFIDrvHandle hWFIDrv, s8 *ps8Rssi);

WILC_Sint32 host_int_get_link_speed(WILC_WFIDrvHandle hWFIDrv, s8 *ps8lnkspd);

/**

 *  @brief              scans a set of channels

 *  @details
@@ -1074,7 +1074,7 @@ void host_int_send_join_leave_info_to_host 
 *  @version		1.0

 */

void host_int_send_network_info_to_host

	(u8 *macStartAddress, u16 u16RxFrameLen, WILC_Sint8 s8Rssi);

	(u8 *macStartAddress, u16 u16RxFrameLen, s8 s8Rssi);



/**

 *  @brief              host interface initialization function

drivers/staging/wilc1000/linux_wlan.c

+1 −1
Original line number Diff line number Diff line
@@ -2375,7 +2375,7 @@ int mac_ioctl(struct net_device *ndev, struct ifreq *req, int cmd) 
{



	u8 *buff = NULL;

	WILC_Sint8 rssi;

	s8 rssi;

	u32 size = 0, length = 0;

	perInterface_wlan_t *nic;

	struct WILC_WFI_priv *priv;