Sledgehammer to the compile errors

classicsc · Sep 13, 2016 · 3d731c1 · 3d731c1
1 parent 5e58d63
commit 3d731c1
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 15 deletions.
diff --git a/Makefile b/Makefile
@@ -139,7 +139,7 @@ HAS_GREENAP_SUPPORT=n
 #Support cfg80211 function with Linux Only.
 #Please make sure insmod the cfg80211.ko before our driver,
 #our driver references to its symbol.
-HAS_CFG80211_SUPPORT=y
+HAS_CFG80211_SUPPORT=n
 #smooth the scan signal for cfg80211 based driver
 HAS_CFG80211_SCAN_SIGNAL_AVG_SUPPORT=y
 #Cfg80211-based P2P Support

diff --git a/ate/common/rt_ate.c b/ate/common/rt_ate.c
@@ -3845,12 +3845,13 @@ INT Set_ATE_Load_E2P_From_Buf_Proc(
 {
 	BOOLEAN		    	ret = FALSE;
 	UINT32 			value = (UINT32) simple_strtol(arg, 0, 10);
+	USHORT 			WriteEEPROM[(EEPROM_SIZE >> 1)];
 
 	DBGPRINT(RT_DEBUG_OFF, ("===> %s (value=%d)\n\n", __FUNCTION__, value));
 
 	if (value > 0)
 	{
-		rt_ee_write_all(pAd, pAd->EEPROMImage);
+		rt_ee_write_all(pAd, WriteEEPROM);
 		ret = TRUE;
 
 	}

diff --git a/common/cmm_info.c b/common/cmm_info.c
@@ -5163,7 +5163,7 @@ INT Show_MacTable_Proc(RTMP_ADAPTER *pAd, PSTRING arg)
 {
 	INT i;
     	UINT32 RegValue;
-	ULONG DataRate=0;
+	UINT32 DataRate=0;
 
 
 	printk("\n");
@@ -5260,7 +5260,7 @@ INT Show_MacTable_Proc(RTMP_ADAPTER *pAd, PSTRING arg)
 INT show_stainfo_proc(RTMP_ADAPTER *pAd, PSTRING arg)
 {
 	INT i;
-	ULONG DataRate=0;
+	UINT32 DataRate=0;
 	UCHAR mac_addr[MAC_ADDR_LEN];
 	PSTRING token;
 	CHAR sep[1] = {':'};
@@ -5624,7 +5624,7 @@ INT	Show_ModuleTxpower_Proc(
 }
 #endif/*APCLI_SUPPORT*/
 
-void  getRate(HTTRANSMIT_SETTING HTSetting, ULONG* fLastTxRxRate)
+void  getRate(HTTRANSMIT_SETTING HTSetting, UINT32* fLastTxRxRate)
 
 {
 	VOID *pAd = NULL;
@@ -8089,7 +8089,7 @@ INT Show_Diag_Proc(RTMP_ADAPTER *pAd, PSTRING arg)
 	UCHAR vht_mcs_max_idx = MAX_VHT_MCS_SET;
 #endif /* DOT11_VHT_AC */
 
-	os_alloc_mem(pAd, &pDiag, sizeof(RtmpDiagStruct));
+	os_alloc_mem(pAd, (UCHAR **)&pDiag, sizeof(RtmpDiagStruct));
 	if (!pDiag) {
 		DBGPRINT(RT_DEBUG_ERROR, ("%s():AllocMem failed!\n", __FUNCTION__));
 		return FALSE;

diff --git a/common/cmm_txbf_cal.c b/common/cmm_txbf_cal.c
@@ -2196,7 +2196,7 @@ INT ITxBFPhaseCalibration(
 	LONG   avgIData, avgQData;
 	UCHAR  peakI[3];
 	UCHAR  i;
-	INT    divPhase[2] = {0};
+	UCHAR  divPhase[2] = {0};
 	INT    phaseValues[2] = {0};
 	BOOLEAN gBandFlg = FALSE;
 

diff --git a/common/rtusb_dev_id.c b/common/rtusb_dev_id.c
@@ -40,6 +40,7 @@ USB_DEVICE_ID rtusb_dev_id[] = {
 	{USB_DEVICE(0x0b05, 0x180b),  .driver_info = RLT_MAC_BASE},	/*  ASUS USB N53 B1 */
 	{USB_DEVICE(0x7392, 0xb711),  .driver_info = RLT_MAC_BASE},	/*  Edimax EW 7722 UAC */
 	{USB_DEVICE(0x0846, 0x9053),  .driver_info = RLT_MAC_BASE},	/*  Netgear A6210 */
+	{USB_DEVICE(0x2357, 0x0105),  .driver_info = RLT_MAC_BASE},     /*  TP-Link Archer T1U */
 #endif
 	{ }/* Terminating entry */
 };

diff --git a/common/rtusb_io.c b/common/rtusb_io.c
@@ -445,7 +445,7 @@ NTSTATUS RTUSBWriteMACRegister(
 		Status = RTUSBMultiWrite_nBytes(
 		pAd,
 		Offset,
-		&Value,
+		(UCHAR)&Value,
 		4,
 		4);
 	}

diff --git a/include/.rtmp.h.swp b/include/.rtmp.h.swp
diff --git a/include/rtmp.h b/include/rtmp.h
@@ -8099,7 +8099,7 @@ VOID MaintainBssTable(
 	IN  UCHAR	MaxSameRxTimeCount);
 #endif /* CONFIG_STA_SUPPORT */
 
-void  getRate(HTTRANSMIT_SETTING HTSetting, ULONG* fLastTxRxRate);
+void  getRate(HTTRANSMIT_SETTING HTSetting, UINT32* fLastTxRxRate);
 
 
 #ifdef APCLI_SUPPORT

diff --git a/mcu/.mcu_and.c.swp b/mcu/.mcu_and.c.swp
diff --git a/mcu/mcu.c b/mcu/mcu.c
@@ -105,7 +105,7 @@ VOID ChipOpsMCUHook(PRTMP_ADAPTER pAd, enum MCU_TYPE MCUType)
 			//pChipOps->sendCommandToMcu = andes_send_cmd_msg;
 			pChipOps->MCUCtrlInit = andes_ctrl_init;
 			pChipOps->MCUCtrlExit = andes_ctrl_exit;
-			pChipOps->Calibration = andes_calibration;
+			pChipOps->Calibration = (VOID*)andes_calibration;
 			pChipOps->BurstWrite =  andes_burst_write;
 			pChipOps->BurstRead = andes_burst_read;
 			pChipOps->RandomRead = andes_random_read;

diff --git a/mcu/mcu_and.c b/mcu/mcu_and.c
@@ -438,7 +438,7 @@ int andes_usb_load_rom_patch(RTMP_ADAPTER *ad)
 									 cap->CommandBulkOutAddr,
 									 rom_patch_data,
 									 sent_len + sizeof(*tx_info) + 4,
-									 usb_upload_rom_patch_complete,
+									 (usb_complete_t)usb_upload_rom_patch_complete,
 									 &load_rom_patch_done,
 									 rom_patch_dma);
 
@@ -860,7 +860,7 @@ NDIS_STATUS andes_usb_loadfw(RTMP_ADAPTER *ad)
 									 cap->CommandBulkOutAddr,
 									 fw_data,
 									 sent_len + sizeof(*tx_info) + USB_END_PADDING,
-									 usb_uploadfw_complete,
+									 (usb_complete_t)usb_uploadfw_complete,
 									 &load_fw_done,
 									 fw_dma);
 
@@ -1017,7 +1017,7 @@ NDIS_STATUS andes_usb_loadfw(RTMP_ADAPTER *ad)
 									 cap->CommandBulkOutAddr,
 									 fw_data,
 									 sent_len + sizeof(*tx_info) + USB_END_PADDING,
-									 usb_uploadfw_complete,
+									 (usb_complete_t)usb_uploadfw_complete,
 									 &load_fw_done,
 									 fw_dma);
 

diff --git a/sta/sta_cfg.c b/sta/sta_cfg.c
@@ -3327,11 +3327,11 @@ INT RTMPQueryInformation(
     NDIS_802_11_AUTHENTICATION_MODE AuthMode;
     NDIS_802_11_WEP_STATUS WepStatus;
     NDIS_MEDIA_STATE MediaState;
-    ULONG BssBufSize, ulInfo=0, NetworkTypeList[4], apsd = 0, RateValue=0;
+    ULONG BssBufSize, ulInfo=0, NetworkTypeList[4], apsd = 0; 
     USHORT BssLen = 0;
     PUCHAR pBuf = NULL, pPtr;
     INT Status = NDIS_STATUS_SUCCESS;
-    UINT we_version_compiled;
+    UINT we_version_compiled, RateValue=0;
     UCHAR i, Padding = 0;
     BOOLEAN RadioState;
     STRING driverVersion[8];

diff --git a/tools/bin2h b/tools/bin2h
-Original file line number
+Diff line change
@@ Expand Up / @@ -445,7 +445,7 @@ NTSTATUS RTUSBWriteMACRegister( @@
     		Status = RTUSBMultiWrite_nBytes(
     		pAd,
     		Offset,
-    		&Value,
+    		(UCHAR)&Value,
 ,
 );
     	}
@@ Expand Down @@