Cc: Vipin Mehta <vmehta@xxxxxxxxxxx> Cc: Naveen Singh <naveen.singh@xxxxxxxxxxx> Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx> --- drivers/staging/ath6kl/bmi/include/bmi_internal.h | 4 +- drivers/staging/ath6kl/bmi/src/bmi.c | 34 ++++---- .../hif/sdio/linux_sdio/include/hif_internal.h | 2 +- .../staging/ath6kl/hif/sdio/linux_sdio/src/hif.c | 4 +- drivers/staging/ath6kl/htc2/AR6000/ar6k.c | 4 +- drivers/staging/ath6kl/htc2/htc_internal.h | 2 +- drivers/staging/ath6kl/include/a_debug.h | 2 +- drivers/staging/ath6kl/include/ar6000_diag.h | 4 +- drivers/staging/ath6kl/include/bmi.h | 12 ++-- .../include/common/regulatory/reg_dbschema.h | 2 +- drivers/staging/ath6kl/include/common/testcmd.h | 2 +- drivers/staging/ath6kl/include/common/wmi.h | 4 +- drivers/staging/ath6kl/include/common/wmi_thin.h | 2 +- drivers/staging/ath6kl/include/common_drv.h | 2 +- drivers/staging/ath6kl/include/hif.h | 2 +- drivers/staging/ath6kl/include/wlan_api.h | 4 +- drivers/staging/ath6kl/include/wmi_api.h | 10 +- .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c | 34 ++++---- .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h | 4 +- .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c | 36 ++++---- .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h | 8 +- drivers/staging/ath6kl/miscdrv/common_drv.c | 32 ++++---- drivers/staging/ath6kl/os/linux/ar6000_drv.c | 82 ++++++++++---------- drivers/staging/ath6kl/os/linux/eeprom.c | 6 +- .../staging/ath6kl/os/linux/include/ar6000_drv.h | 2 +- .../ath6kl/os/linux/include/athtypes_linux.h | 1 - drivers/staging/ath6kl/os/linux/ioctl.c | 4 +- drivers/staging/ath6kl/wlan/src/wlan_node.c | 8 +- drivers/staging/ath6kl/wmi/wmi.c | 16 ++-- 29 files changed, 164 insertions(+), 165 deletions(-) diff --git a/drivers/staging/ath6kl/bmi/include/bmi_internal.h b/drivers/staging/ath6kl/bmi/include/bmi_internal.h index 18c8df1..04d601f 100644 --- a/drivers/staging/ath6kl/bmi/include/bmi_internal.h +++ b/drivers/staging/ath6kl/bmi/include/bmi_internal.h @@ -40,10 +40,10 @@ /* ------ Global Variable Declarations ------- */ static bool bmiDone; -int bmiBufferSend(HIF_DEVICE * device, A_UCHAR * buffer, u32 length); +int bmiBufferSend(HIF_DEVICE * device, u8 * buffer, u32 length); int bmiBufferReceive(HIF_DEVICE * device, - A_UCHAR * buffer, u32 length, bool want_timeout); + u8 * buffer, u32 length, bool want_timeout); #endif diff --git a/drivers/staging/ath6kl/bmi/src/bmi.c b/drivers/staging/ath6kl/bmi/src/bmi.c index fe6f1be..97cf3e3 100644 --- a/drivers/staging/ath6kl/bmi/src/bmi.c +++ b/drivers/staging/ath6kl/bmi/src/bmi.c @@ -54,7 +54,7 @@ very simple. static bool pendingEventsFuncCheck = false; static u32 *pBMICmdCredits; -static A_UCHAR *pBMICmdBuf; +static u8 *pBMICmdBuf; #define MAX_BMI_CMDBUF_SZ (BMI_DATASZ_MAX + \ sizeof(u32) /* cmd */ + \ sizeof(u32) /* addr */ + \ @@ -82,7 +82,7 @@ void BMIInit(void) } if (!pBMICmdBuf) { - pBMICmdBuf = (A_UCHAR *) A_MALLOC_NOWAIT(MAX_BMI_CMDBUF_SZ); + pBMICmdBuf = (u8 *) A_MALLOC_NOWAIT(MAX_BMI_CMDBUF_SZ); A_ASSERT(pBMICmdBuf); } @@ -117,7 +117,7 @@ int BMIDone(HIF_DEVICE * device) bmiDone = true; cid = BMI_DONE; - status = bmiBufferSend(device, (A_UCHAR *) & cid, sizeof(cid)); + status = bmiBufferSend(device, (u8 *) & cid, sizeof(cid)); if (status) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n")); @@ -154,14 +154,14 @@ int BMIGetTargetInfo(HIF_DEVICE * device, struct bmi_target_info *targ_info) device)); cid = BMI_GET_TARGET_INFO; - status = bmiBufferSend(device, (A_UCHAR *) & cid, sizeof(cid)); + status = bmiBufferSend(device, (u8 *) & cid, sizeof(cid)); if (status) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n")); return A_ERROR; } - status = bmiBufferReceive(device, (A_UCHAR *) & targ_info->target_ver, + status = bmiBufferReceive(device, (u8 *) & targ_info->target_ver, sizeof(targ_info->target_ver), true); if (status) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, @@ -173,7 +173,7 @@ int BMIGetTargetInfo(HIF_DEVICE * device, struct bmi_target_info *targ_info) /* Determine how many bytes are in the Target's targ_info */ status = bmiBufferReceive(device, - (A_UCHAR *) & targ_info-> + (u8 *) & targ_info-> target_info_byte_count, sizeof(targ_info->target_info_byte_count), true); @@ -192,7 +192,7 @@ int BMIGetTargetInfo(HIF_DEVICE * device, struct bmi_target_info *targ_info) /* Read the remainder of the targ_info */ status = bmiBufferReceive(device, - ((A_UCHAR *) targ_info) + + ((u8 *) targ_info) + sizeof(targ_info-> target_info_byte_count), sizeof(*targ_info) - @@ -214,7 +214,7 @@ int BMIGetTargetInfo(HIF_DEVICE * device, struct bmi_target_info *targ_info) } int -BMIReadMemory(HIF_DEVICE * device, u32 address, A_UCHAR * buffer, u32 length) +BMIReadMemory(HIF_DEVICE * device, u32 address, u8 * buffer, u32 length) { u32 cid; int status; @@ -273,15 +273,15 @@ BMIReadMemory(HIF_DEVICE * device, u32 address, A_UCHAR * buffer, u32 length) } int -BMIWriteMemory(HIF_DEVICE * device, u32 address, A_UCHAR * buffer, u32 length) +BMIWriteMemory(HIF_DEVICE * device, u32 address, u8 * buffer, u32 length) { u32 cid; int status; u32 offset; u32 remaining, txlen; const u32 header = sizeof(cid) + sizeof(address) + sizeof(length); - A_UCHAR alignedBuffer[BMI_DATASZ_MAX]; - A_UCHAR *src; + u8 alignedBuffer[BMI_DATASZ_MAX]; + u8 *src; A_ASSERT(BMI_COMMAND_FITS(BMI_DATASZ_MAX + header)); memset(pBMICmdBuf, 0, BMI_DATASZ_MAX + header); @@ -667,7 +667,7 @@ BMIrompatchDeactivate(HIF_DEVICE * device, rompatch_list, 0); } -int BMILZData(HIF_DEVICE * device, A_UCHAR * buffer, u32 length) +int BMILZData(HIF_DEVICE * device, u8 * buffer, u32 length) { u32 cid; int status; @@ -752,7 +752,7 @@ int BMILZStreamStart(HIF_DEVICE * device, u32 address) } /* BMI Access routines */ -int bmiBufferSend(HIF_DEVICE * device, A_UCHAR * buffer, u32 length) +int bmiBufferSend(HIF_DEVICE * device, u8 * buffer, u32 length) { int status; u32 timeout; @@ -803,7 +803,7 @@ int bmiBufferSend(HIF_DEVICE * device, A_UCHAR * buffer, u32 length) int bmiBufferReceive(HIF_DEVICE * device, - A_UCHAR * buffer, u32 length, bool want_timeout) + u8 * buffer, u32 length, bool want_timeout) { int status; u32 address; @@ -984,7 +984,7 @@ bmiBufferReceive(HIF_DEVICE * device, int BMIFastDownload(HIF_DEVICE * device, u32 address, - A_UCHAR * buffer, u32 length) { + u8 * buffer, u32 length) { int status = A_ERROR; u32 lastWord = 0; u32 lastWordOffset = length & ~0x3; u32 unalignedBytes = length & 0x3; @@ -1013,12 +1013,12 @@ bmiBufferReceive(HIF_DEVICE * device, return status;} int - BMIRawWrite(HIF_DEVICE * device, A_UCHAR * buffer, + BMIRawWrite(HIF_DEVICE * device, u8 * buffer, u32 length) { return bmiBufferSend(device, buffer, length);} int - BMIRawRead(HIF_DEVICE * device, A_UCHAR * buffer, + BMIRawRead(HIF_DEVICE * device, u8 * buffer, u32 length, bool want_timeout) { return bmiBufferReceive(device, buffer, length, want_timeout);} diff --git a/drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h b/drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h index 46469e1..e5d212b 100644 --- a/drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h +++ b/drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h @@ -54,7 +54,7 @@ typedef struct bus_request { struct bus_request *inusenext; /* link list of in use requests */ struct semaphore sem_req; u32 address; /* request data */ - A_UCHAR *buffer; + u8 *buffer; u32 length; u32 request; void *context; diff --git a/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c b/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c index 46060f3..d5e92b0 100644 --- a/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c +++ b/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c @@ -155,7 +155,7 @@ int HIFInit(OSDRV_CALLBACKS * callbacks) static int __HIFReadWrite(HIF_DEVICE * device, u32 address, - A_UCHAR * buffer, u32 length, u32 request, void *context) + u8 * buffer, u32 length, u32 request, void *context) { u8 opcode; int status = 0; @@ -356,7 +356,7 @@ void AddToAsyncList(HIF_DEVICE * device, BUS_REQUEST * busrequest) int HIFReadWrite(HIF_DEVICE * device, u32 address, - A_UCHAR * buffer, u32 length, u32 request, void *context) + u8 * buffer, u32 length, u32 request, void *context) { int status = 0; BUS_REQUEST *busrequest; diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k.c b/drivers/staging/ath6kl/htc2/AR6000/ar6k.c index 759fb3b..b0302a4 100644 --- a/drivers/staging/ath6kl/htc2/AR6000/ar6k.c +++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k.c @@ -514,7 +514,7 @@ int DevWaitForPendingRecv(AR6K_DEVICE * pDev, u32 TimeoutInMs, bool * pbIsRecvPending) { int status = 0; - A_UCHAR host_int_status = 0x0; + u8 host_int_status = 0x0; u32 counter = 0x0; if (TimeoutInMs < 100) { @@ -528,7 +528,7 @@ int DevWaitForPendingRecv(AR6K_DEVICE * pDev, u32 TimeoutInMs, status = HIFReadWrite(pDev->HIFDevice, HOST_INT_STATUS_ADDRESS, &host_int_status, - sizeof(A_UCHAR), + sizeof(u8), HIF_RD_SYNC_BYTE_INC, NULL); if (status) { AR_DEBUG_PRINTF(ATH_LOG_ERR, diff --git a/drivers/staging/ath6kl/htc2/htc_internal.h b/drivers/staging/ath6kl/htc2/htc_internal.h index 97895de..f31907e8 100644 --- a/drivers/staging/ath6kl/htc2/htc_internal.h +++ b/drivers/staging/ath6kl/htc2/htc_internal.h @@ -184,7 +184,7 @@ extern "C" { #ifdef ATH_DEBUG_MODULE void DumpCreditDist(HTC_ENDPOINT_CREDIT_DIST * pEPDist); void DumpCreditDistStates(HTC_TARGET * target); - void DebugDumpBytes(A_UCHAR * buffer, u16 length, char *pDescription); + void DebugDumpBytes(u8 * buffer, u16 length, char *pDescription); #endif static INLINE HTC_PACKET *HTC_ALLOC_CONTROL_TX(HTC_TARGET * target) { diff --git a/drivers/staging/ath6kl/include/a_debug.h b/drivers/staging/ath6kl/include/a_debug.h index e87a895..a90d6c4 100644 --- a/drivers/staging/ath6kl/include/a_debug.h +++ b/drivers/staging/ath6kl/include/a_debug.h @@ -57,7 +57,7 @@ extern "C" { /* macro to make a module-specific masks */ #define ATH_DEBUG_MAKE_MODULE_MASK(index) (1 << (ATH_DEBUG_MODULE_MASK_SHIFT + (index))) - void DebugDumpBytes(A_UCHAR * buffer, u16 length, char *pDescription); + void DebugDumpBytes(u8 * buffer, u16 length, char *pDescription); /* Debug support on a per-module basis * diff --git a/drivers/staging/ath6kl/include/ar6000_diag.h b/drivers/staging/ath6kl/include/ar6000_diag.h index a020f27..aaeaf98 100644 --- a/drivers/staging/ath6kl/include/ar6000_diag.h +++ b/drivers/staging/ath6kl/include/ar6000_diag.h @@ -30,11 +30,11 @@ int ar6000_WriteRegDiag(HIF_DEVICE * hifDevice, u32 * address, u32 * data); int ar6000_ReadDataDiag(HIF_DEVICE * hifDevice, u32 address, - A_UCHAR * data, u32 length); + u8 * data, u32 length); int ar6000_WriteDataDiag(HIF_DEVICE * hifDevice, u32 address, - A_UCHAR * data, u32 length); + u8 * data, u32 length); int ar6k_ReadTargetRegister(HIF_DEVICE * hifDevice, int regsel, u32 * regval); diff --git a/drivers/staging/ath6kl/include/bmi.h b/drivers/staging/ath6kl/include/bmi.h index ba6c514..ca995b4 100644 --- a/drivers/staging/ath6kl/include/bmi.h +++ b/drivers/staging/ath6kl/include/bmi.h @@ -52,11 +52,11 @@ extern "C" { int BMIReadMemory(HIF_DEVICE * device, - u32 address, A_UCHAR * buffer, u32 length); + u32 address, u8 * buffer, u32 length); int BMIWriteMemory(HIF_DEVICE * device, - u32 address, A_UCHAR * buffer, u32 length); + u32 address, u8 * buffer, u32 length); int BMIExecute(HIF_DEVICE * device, u32 address, u32 * param); @@ -91,18 +91,18 @@ extern "C" { BMILZStreamStart(HIF_DEVICE * device, u32 address); int - BMILZData(HIF_DEVICE * device, A_UCHAR * buffer, u32 length); + BMILZData(HIF_DEVICE * device, u8 * buffer, u32 length); int BMIFastDownload(HIF_DEVICE * device, - u32 address, A_UCHAR * buffer, u32 length); + u32 address, u8 * buffer, u32 length); int - BMIRawWrite(HIF_DEVICE * device, A_UCHAR * buffer, u32 length); + BMIRawWrite(HIF_DEVICE * device, u8 * buffer, u32 length); int BMIRawRead(HIF_DEVICE * device, - A_UCHAR * buffer, u32 length, bool want_timeout); + u8 * buffer, u32 length, bool want_timeout); #ifdef __cplusplus } diff --git a/drivers/staging/ath6kl/include/common/regulatory/reg_dbschema.h b/drivers/staging/ath6kl/include/common/regulatory/reg_dbschema.h index 33d0a3c..c64b03d 100644 --- a/drivers/staging/ath6kl/include/common/regulatory/reg_dbschema.h +++ b/drivers/staging/ath6kl/include/common/regulatory/reg_dbschema.h @@ -119,7 +119,7 @@ enum searchType { * instance of table). */ typedef PREPACK struct dbMasterTable_t { /* Hold ptrs to Table data structures */ - A_UCHAR numOfEntries; + u8 numOfEntries; char entrySize; /* Entry size per table row */ char searchType; /* Index based access or key based */ char reserved[3]; /* for alignment */ diff --git a/drivers/staging/ath6kl/include/common/testcmd.h b/drivers/staging/ath6kl/include/common/testcmd.h index 5af5097..9b7f327 100644 --- a/drivers/staging/ath6kl/include/common/testcmd.h +++ b/drivers/staging/ath6kl/include/common/testcmd.h @@ -142,7 +142,7 @@ Note : Enable/disable continuous tx test cmd works only when target is awake. u16 rateCntShortGuard[TCMD_MAX_RATES]; } POSTPACK report; struct PREPACK TCMD_CONT_RX_MAC { - A_UCHAR addr[ATH_MAC_LEN]; + u8 addr[ATH_MAC_LEN]; } POSTPACK mac; struct PREPACK TCMD_CONT_RX_ANT_SWITCH_TABLE { u32 antswitch1; diff --git a/drivers/staging/ath6kl/include/common/wmi.h b/drivers/staging/ath6kl/include/common/wmi.h index f4b74a8..6e28d46 100644 --- a/drivers/staging/ath6kl/include/common/wmi.h +++ b/drivers/staging/ath6kl/include/common/wmi.h @@ -524,7 +524,7 @@ extern "C" { u8 groupCryptoType; u8 groupCryptoLen; u8 ssidLength; - A_UCHAR ssid[WMI_MAX_SSID_LEN]; + u8 ssid[WMI_MAX_SSID_LEN]; u16 channel; u8 bssid[ATH_MAC_LEN]; u32 ctrl_flags; @@ -2992,7 +2992,7 @@ extern "C" { #define WMI_DISABLE_REGULATORY_CODE "FF" typedef PREPACK struct { - A_UCHAR countryCode[3]; + u8 countryCode[3]; } POSTPACK WMI_AP_SET_COUNTRY_CMD; typedef PREPACK struct { diff --git a/drivers/staging/ath6kl/include/common/wmi_thin.h b/drivers/staging/ath6kl/include/common/wmi_thin.h index 7ee7906..aafed1f 100644 --- a/drivers/staging/ath6kl/include/common/wmi_thin.h +++ b/drivers/staging/ath6kl/include/common/wmi_thin.h @@ -305,7 +305,7 @@ extern "C" { u8 ssidLength; /* 0 - 32 */ u8 probe; /* != 0 : issue probe req at start */ u8 reserved; /* alignment */ - A_UCHAR ssid[WMI_MAX_SSID_LEN]; + u8 ssid[WMI_MAX_SSID_LEN]; u8 bssid[ATH_MAC_LEN]; } POSTPACK WMI_THIN_JOIN_CMD; diff --git a/drivers/staging/ath6kl/include/common_drv.h b/drivers/staging/ath6kl/include/common_drv.h index 64de7a9..ffb0d02 100644 --- a/drivers/staging/ath6kl/include/common_drv.h +++ b/drivers/staging/ath6kl/include/common_drv.h @@ -74,7 +74,7 @@ extern "C" { u32 * data); int ar6000_ReadDataDiag(HIF_DEVICE * hifDevice, u32 address, - A_UCHAR * data, u32 length); + u8 * data, u32 length); int ar6000_reset_device(HIF_DEVICE * hifDevice, u32 TargetType, bool waitForCompletion, bool coldReset); diff --git a/drivers/staging/ath6kl/include/hif.h b/drivers/staging/ath6kl/include/hif.h index d810518..35aca98 100644 --- a/drivers/staging/ath6kl/include/hif.h +++ b/drivers/staging/ath6kl/include/hif.h @@ -404,7 +404,7 @@ extern "C" { int HIFReadWrite(HIF_DEVICE * device, u32 address, - A_UCHAR * buffer, u32 length, u32 request, void *context); + u8 * buffer, u32 length, u32 request, void *context); /* * This can be initiated from the unload driver context when the OSDRV layer has no more use for diff --git a/drivers/staging/ath6kl/include/wlan_api.h b/drivers/staging/ath6kl/include/wlan_api.h index d0fa728..2576d30 100644 --- a/drivers/staging/ath6kl/include/wlan_api.h +++ b/drivers/staging/ath6kl/include/wlan_api.h @@ -108,7 +108,7 @@ extern "C" { wlan_refresh_inactive_nodes(struct ieee80211_node_table *nt); bss_t *wlan_find_Ssidnode(struct ieee80211_node_table *nt, - A_UCHAR * pSsid, u32 ssidLength, bool bIsWPA2, + u8 * pSsid, u32 ssidLength, bool bIsWPA2, bool bMatchSSID); void @@ -117,7 +117,7 @@ extern "C" { bss_t *wlan_node_remove(struct ieee80211_node_table *nt, u8 * bssid); bss_t *wlan_find_matching_Ssidnode(struct ieee80211_node_table *nt, - A_UCHAR * pSsid, u32 ssidLength, + u8 * pSsid, u32 ssidLength, u32 dot11AuthMode, u32 authMode, u32 pairwiseCryptoType, u32 grpwiseCryptoTyp); diff --git a/drivers/staging/ath6kl/include/wmi_api.h b/drivers/staging/ath6kl/include/wmi_api.h index 795dbad..d75e310 100644 --- a/drivers/staging/ath6kl/include/wmi_api.h +++ b/drivers/staging/ath6kl/include/wmi_api.h @@ -115,7 +115,7 @@ extern "C" { CRYPTO_TYPE groupCrypto, u8 groupCryptoLen, int ssidLength, - A_UCHAR * ssid, + u8 * ssid, u8 * bssid, u16 channel, u32 ctrl_flags); int wmi_reconnect_cmd(struct wmi_t *wmip, u8 * bssid, u16 channel); @@ -134,7 +134,7 @@ extern "C" { u16 maxact_scan_per_ssid); int wmi_bssfilter_cmd(struct wmi_t *wmip, u8 filter, u32 ieMask); int wmi_probedSsid_cmd(struct wmi_t *wmip, u8 index, u8 flag, - u8 ssidLength, A_UCHAR * ssid); + u8 ssidLength, u8 * ssid); int wmi_listeninterval_cmd(struct wmi_t *wmip, u16 listenInterval, u16 listenBeacons); int wmi_bmisstime_cmd(struct wmi_t *wmip, u16 bmisstime, @@ -298,7 +298,7 @@ extern "C" { int wmi_set_qos_supp_cmd(struct wmi_t *wmip, u8 status); int wmi_set_wmm_cmd(struct wmi_t *wmip, WMI_WMM_STATUS status); int wmi_set_wmm_txop(struct wmi_t *wmip, WMI_TXOP_CFG txEnable); - int wmi_set_country(struct wmi_t *wmip, A_UCHAR * countryCode); + int wmi_set_country(struct wmi_t *wmip, u8 * countryCode); int wmi_get_keepalive_configured(struct wmi_t *wmip); u8 wmi_get_keepalive_cmd(struct wmi_t *wmip); @@ -342,7 +342,7 @@ extern "C" { int wmi_mcast_filter_cmd(struct wmi_t *wmip, u8 enable); - bss_t *wmi_find_Ssidnode(struct wmi_t *wmip, A_UCHAR * pSsid, + bss_t *wmi_find_Ssidnode(struct wmi_t *wmip, u8 * pSsid, u32 ssidLength, bool bIsWPA2, bool bMatchSSID); void @@ -446,7 +446,7 @@ extern "C" { u32 wmi_freq2ieee(u16 freq); - bss_t *wmi_find_matching_Ssidnode(struct wmi_t *wmip, A_UCHAR * pSsid, + bss_t *wmi_find_matching_Ssidnode(struct wmi_t *wmip, u8 * pSsid, u32 ssidLength, u32 dot11AuthMode, u32 authMode, u32 pairwiseCryptoType, diff --git a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c index 724919b..fec3039 100644 --- a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c +++ b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c @@ -60,20 +60,20 @@ int ReadVersionInfo(AR3K_CONFIG_INFO * pConfig); DECLARE_WAIT_QUEUE_HEAD(PsCompleteEvent); DECLARE_WAIT_QUEUE_HEAD(HciEvent); -A_UCHAR *HciEventpacket; +u8 *HciEventpacket; rwlock_t syncLock; wait_queue_t Eventwait; -int PSHciWritepacket(struct hci_dev *, A_UCHAR * Data, u32 len); +int PSHciWritepacket(struct hci_dev *, u8 * Data, u32 len); extern char *bdaddr; #endif /* HCI_TRANSPORT_SDIO */ -int write_bdaddr(AR3K_CONFIG_INFO * pConfig, A_UCHAR * bdaddr, int type); +int write_bdaddr(AR3K_CONFIG_INFO * pConfig, u8 * bdaddr, int type); int PSSendOps(void *arg); #ifdef BT_PS_DEBUG -void Hci_log(A_UCHAR * log_string, A_UCHAR * data, u32 len) +void Hci_log(u8 * log_string, u8 * data, u32 len) { int i; AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("%s : ", log_string)); @@ -135,14 +135,14 @@ int PSSendOps(void *arg) u8 *event; u8 *bufferToFree; struct hci_dev *device; - A_UCHAR *buffer; + u8 *buffer; u32 len; u32 DevType; - A_UCHAR *PsFileName; - A_UCHAR *patchFileName; - A_UCHAR *path = NULL; - A_UCHAR *config_path = NULL; - A_UCHAR config_bdaddr[MAX_BDADDR_FORMAT_LENGTH]; + u8 *PsFileName; + u8 *patchFileName; + u8 *path = NULL; + u8 *config_path = NULL; + u8 config_bdaddr[MAX_BDADDR_FORMAT_LENGTH]; AR3K_CONFIG_INFO *hdev = (AR3K_CONFIG_INFO *) arg; struct device *firmwareDev = NULL; status = 0; @@ -158,14 +158,14 @@ int PSSendOps(void *arg) /* First verify if the controller is an FPGA or ASIC, so depending on the device type the PS file to be written will be different. */ - path = (A_UCHAR *) A_MALLOC(MAX_FW_PATH_LEN); + path = (u8 *) A_MALLOC(MAX_FW_PATH_LEN); if (path == NULL) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Malloc failed to allocate %d bytes for path\n", MAX_FW_PATH_LEN)); goto complete; } - config_path = (A_UCHAR *) A_MALLOC(MAX_FW_PATH_LEN); + config_path = (u8 *) A_MALLOC(MAX_FW_PATH_LEN); if (config_path == NULL) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Malloc failed to allocate %d bytes for config_path\n", @@ -220,7 +220,7 @@ int PSSendOps(void *arg) status = 1; goto complete; } - buffer = (A_UCHAR *) A_MALLOC(firmware->size); + buffer = (u8 *) A_MALLOC(firmware->size); if (buffer != NULL) { /* Copy the read file to a local Dynamic buffer */ memcpy(buffer, firmware->data, firmware->size); @@ -256,7 +256,7 @@ int PSSendOps(void *arg) if (NULL == firmware || firmware->size == 0) { status = 0; } else { - buffer = (A_UCHAR *) A_MALLOC(firmware->size); + buffer = (u8 *) A_MALLOC(firmware->size); if (buffer != NULL) { /* Copy the read file to a local Dynamic buffer */ memcpy(buffer, firmware->data, firmware->size); @@ -422,7 +422,7 @@ int SendHCICommandWaitCommandComplete(AR3K_CONFIG_INFO * pConfig, } #endif /* HCI_TRANSPORT_SDIO */ -int ReadPSEvent(A_UCHAR * Data) +int ReadPSEvent(u8 * Data) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, (" PS Event %x %x %x\n", Data[4], Data[5], Data[3])); @@ -484,9 +484,9 @@ int str2ba(unsigned char *str_bdaddr, unsigned char *bdaddr) return 0; } -int write_bdaddr(AR3K_CONFIG_INFO * pConfig, A_UCHAR * bdaddr, int type) +int write_bdaddr(AR3K_CONFIG_INFO * pConfig, u8 * bdaddr, int type) { - A_UCHAR bdaddr_cmd[] = { 0x0B, 0xFC, 0x0A, 0x01, 0x01, + u8 bdaddr_cmd[] = { 0x0B, 0xFC, 0x0A, 0x01, 0x01, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; diff --git a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h index b5ffbd4..fde63bc 100644 --- a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h +++ b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h @@ -62,9 +62,9 @@ #define AR3K_CONFIG_INFO struct hci_dev extern wait_queue_head_t HciEvent; extern wait_queue_t Eventwait; -extern A_UCHAR *HciEventpacket; +extern u8 *HciEventpacket; #endif /* #ifndef HCI_TRANSPORT_SDIO */ int AthPSInitialize(AR3K_CONFIG_INFO * hdev); -int ReadPSEvent(A_UCHAR * Data); +int ReadPSEvent(u8 * Data); #endif /* __AR3KPSCONFIG_H */ diff --git a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c index 30505a26..68ab904 100644 --- a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c +++ b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c @@ -116,15 +116,15 @@ u32 StartTagId; tPsTagEntry PsTagEntry[RAMPS_MAX_PS_TAGS_PER_FILE]; tRamPatch RamPatch[MAX_NUM_PATCH_ENTRY]; -int AthParseFilesUnified(A_UCHAR * srcbuffer, u32 srclen, int FileFormat); -char AthReadChar(A_UCHAR * buffer, u32 len, u32 * pos); -char *AthGetLine(char *buffer, int maxlen, A_UCHAR * srcbuffer, u32 len, +int AthParseFilesUnified(u8 * srcbuffer, u32 srclen, int FileFormat); +char AthReadChar(u8 * buffer, u32 len, u32 * pos); +char *AthGetLine(char *buffer, int maxlen, u8 * srcbuffer, u32 len, u32 * pos); -static int AthPSCreateHCICommand(A_UCHAR Opcode, u32 Param1, +static int AthPSCreateHCICommand(u8 Opcode, u32 Param1, PSCmdPacket * PSPatchPacket, u32 * index); /* Function to reads the next character from the input buffer */ -char AthReadChar(A_UCHAR * buffer, u32 len, u32 * pos) +char AthReadChar(u8 * buffer, u32 len, u32 * pos) { char Ch; if (buffer == NULL || *pos >= len) { @@ -295,7 +295,7 @@ unsigned int uReadDataInSection(char *pCharLine, } } -int AthParseFilesUnified(A_UCHAR * srcbuffer, u32 srclen, int FileFormat) +int AthParseFilesUnified(u8 * srcbuffer, u32 srclen, int FileFormat) { char *Buffer; char *pCharLine; @@ -633,7 +633,7 @@ int AthParseFilesUnified(A_UCHAR * srcbuffer, u32 srclen, int FileFormat) /********************/ -int GetNextTwoChar(A_UCHAR * srcbuffer, u32 len, u32 * pos, char *buffer) +int GetNextTwoChar(u8 * srcbuffer, u32 len, u32 * pos, char *buffer) { unsigned char ch; @@ -652,7 +652,7 @@ int GetNextTwoChar(A_UCHAR * srcbuffer, u32 len, u32 * pos, char *buffer) return 0; } -int AthDoParsePatch(A_UCHAR * patchbuffer, u32 patchlen) +int AthDoParsePatch(u8 * patchbuffer, u32 patchlen) { char Byte[3]; @@ -734,7 +734,7 @@ int AthDoParsePatch(A_UCHAR * patchbuffer, u32 patchlen) } /********************/ -int AthDoParsePS(A_UCHAR * srcbuffer, u32 srclen) +int AthDoParsePS(u8 * srcbuffer, u32 srclen) { int status; int i; @@ -790,7 +790,7 @@ int AthDoParsePS(A_UCHAR * srcbuffer, u32 srclen) return status; } -char *AthGetLine(char *buffer, int maxlen, A_UCHAR * srcbuffer, u32 len, +char *AthGetLine(char *buffer, int maxlen, u8 * srcbuffer, u32 len, u32 * pos) { @@ -827,7 +827,7 @@ char *AthGetLine(char *buffer, int maxlen, A_UCHAR * srcbuffer, u32 len, return buffer; } -static void LoadHeader(A_UCHAR * HCI_PS_Command, A_UCHAR opcode, int length, +static void LoadHeader(u8 * HCI_PS_Command, u8 opcode, int length, int index) { @@ -927,10 +927,10 @@ int AthCreateCommandList(PSCmdPacket ** HciPacketList, u32 * numPackets) //////////////////////// ///////////// -static int AthPSCreateHCICommand(A_UCHAR Opcode, u32 Param1, +static int AthPSCreateHCICommand(u8 Opcode, u32 Param1, PSCmdPacket * PSPatchPacket, u32 * index) { - A_UCHAR *HCI_PS_Command; + u8 *HCI_PS_Command; u32 Length; int i, j; @@ -940,7 +940,7 @@ static int AthPSCreateHCICommand(A_UCHAR Opcode, u32 Param1, for (i = 0; i < Param1; i++) { HCI_PS_Command = - (A_UCHAR *) A_MALLOC(RamPatch[i].Len + + (u8 *) A_MALLOC(RamPatch[i].Len + HCI_COMMAND_HEADER); AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Allocated Buffer Size %d\n", @@ -971,7 +971,7 @@ static int AthPSCreateHCICommand(A_UCHAR Opcode, u32 Param1, Length = 0; i = 0; HCI_PS_Command = - (A_UCHAR *) A_MALLOC(Length + HCI_COMMAND_HEADER); + (u8 *) A_MALLOC(Length + HCI_COMMAND_HEADER); if (HCI_PS_Command == NULL) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("MALLOC Failed\r\n")); return A_ERROR; @@ -989,7 +989,7 @@ static int AthPSCreateHCICommand(A_UCHAR Opcode, u32 Param1, Length = 0x06; i = 0; HCI_PS_Command = - (A_UCHAR *) A_MALLOC(Length + HCI_COMMAND_HEADER); + (u8 *) A_MALLOC(Length + HCI_COMMAND_HEADER); if (HCI_PS_Command == NULL) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("MALLOC Failed\r\n")); return A_ERROR; @@ -1013,7 +1013,7 @@ static int AthPSCreateHCICommand(A_UCHAR Opcode, u32 Param1, BDADDR = true; HCI_PS_Command = - (A_UCHAR *) A_MALLOC(PsTagEntry[i].TagLen + + (u8 *) A_MALLOC(PsTagEntry[i].TagLen + HCI_COMMAND_HEADER); if (HCI_PS_Command == NULL) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, @@ -1048,7 +1048,7 @@ static int AthPSCreateHCICommand(A_UCHAR Opcode, u32 Param1, *index)); HCI_PS_Command = - (A_UCHAR *) A_MALLOC(Length + HCI_COMMAND_HEADER); + (u8 *) A_MALLOC(Length + HCI_COMMAND_HEADER); if (HCI_PS_Command == NULL) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("MALLOC Failed\r\n")); return A_ERROR; diff --git a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h index 9491598..dea7be7 100644 --- a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h +++ b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h @@ -45,7 +45,7 @@ /* Helper data type declaration */ -#ifndef u32 #define A_UCHAR unsigned char +#ifndef u32 #define u8 unsigned char #define u32 unsigned long #define u16 unsigned short #define u8 unsigned char @@ -84,15 +84,15 @@ #define MAX_NUM_PATCH_ENTRY (MAX_PATCH_SIZE/MAX_BYTE_LENGTH) + 1 typedef struct PSCmdPacket { - A_UCHAR *Hcipacket; + u8 *Hcipacket; int packetLen; } PSCmdPacket; /* Parses a Patch information buffer and store it in global structure */ -int AthDoParsePatch(A_UCHAR *, u32); +int AthDoParsePatch(u8 *, u32); /* parses a PS information buffer and stores it in a global structure */ -int AthDoParsePS(A_UCHAR *, u32); +int AthDoParsePS(u8 *, u32); /* * Uses the output of Both AthDoParsePS and AthDoParsePatch APIs to form HCI command array with diff --git a/drivers/staging/ath6kl/miscdrv/common_drv.c b/drivers/staging/ath6kl/miscdrv/common_drv.c index 3c98885..ad7289d 100644 --- a/drivers/staging/ath6kl/miscdrv/common_drv.c +++ b/drivers/staging/ath6kl/miscdrv/common_drv.c @@ -119,7 +119,7 @@ int ar6000_SetAddressWindowRegister(HIF_DEVICE * hifDevice, u32 RegisterAddr, * 3 byte write to bytes 1,2,3 has no effect since we are writing the same values again */ status = HIFReadWrite(hifDevice, RegisterAddr, - (A_UCHAR *) (&Address), + (u8 *) (&Address), 4, HIF_WR_SYNC_BYTE_INC, NULL); if (status) { @@ -144,7 +144,7 @@ int ar6000_SetAddressWindowRegister(HIF_DEVICE * hifDevice, u32 RegisterAddr, /* write bytes 1,2,3 of the register to set the upper address bytes, the LSB is written * last to initiate the access cycle */ status = HIFReadWrite(hifDevice, RegisterAddr + 1, /* write upper 3 bytes */ - ((A_UCHAR *) (&Address)) + 1, + ((u8 *) (&Address)) + 1, sizeof(u32) - 1, HIF_WR_SYNC_BYTE_INC, NULL); if (status) { @@ -157,7 +157,7 @@ int ar6000_SetAddressWindowRegister(HIF_DEVICE * hifDevice, u32 RegisterAddr, /* write the LSB of the register, this initiates the operation */ status = HIFReadWrite(hifDevice, RegisterAddr, - (A_UCHAR *) (&Address), + (u8 *) (&Address), sizeof(u8), HIF_WR_SYNC_BYTE_INC, NULL); if (status) { @@ -192,7 +192,7 @@ int ar6000_ReadRegDiag(HIF_DEVICE * hifDevice, u32 * address, u32 * data) /* read the data */ status = HIFReadWrite(hifDevice, WINDOW_DATA_ADDRESS, - (A_UCHAR *) data, + (u8 *) data, sizeof(u32), HIF_RD_SYNC_BYTE_INC, NULL); if (status) { AR_DEBUG_PRINTF(ATH_LOG_ERR, @@ -214,7 +214,7 @@ int ar6000_WriteRegDiag(HIF_DEVICE * hifDevice, u32 * address, u32 * data) /* set write data */ status = HIFReadWrite(hifDevice, WINDOW_DATA_ADDRESS, - (A_UCHAR *) data, + (u8 *) data, sizeof(u32), HIF_WR_SYNC_BYTE_INC, NULL); if (status) { AR_DEBUG_PRINTF(ATH_LOG_ERR, @@ -231,7 +231,7 @@ int ar6000_WriteRegDiag(HIF_DEVICE * hifDevice, u32 * address, u32 * data) int ar6000_ReadDataDiag(HIF_DEVICE * hifDevice, u32 address, - A_UCHAR * data, u32 length) + u8 * data, u32 length) { u32 count; int status = 0; @@ -248,7 +248,7 @@ ar6000_ReadDataDiag(HIF_DEVICE * hifDevice, u32 address, int ar6000_WriteDataDiag(HIF_DEVICE * hifDevice, u32 address, - A_UCHAR * data, u32 length) + u8 * data, u32 length) { u32 count; int status = 0; @@ -267,8 +267,8 @@ ar6000_WriteDataDiag(HIF_DEVICE * hifDevice, u32 address, int ar6k_ReadTargetRegister(HIF_DEVICE * hifDevice, int regsel, u32 * regval) { int status; - A_UCHAR vals[4]; - A_UCHAR register_selection[4]; + u8 vals[4]; + u8 register_selection[4]; register_selection[0] = register_selection[1] = register_selection[2] = register_selection[3] = (regsel & 0xff); @@ -284,7 +284,7 @@ int ar6k_ReadTargetRegister(HIF_DEVICE * hifDevice, int regsel, u32 * regval) status = HIFReadWrite(hifDevice, CPU_DBG_ADDRESS, - (A_UCHAR *) vals, + (u8 *) vals, sizeof(vals), HIF_RD_SYNC_BYTE_INC, NULL); if (status) { AR_DEBUG_PRINTF(ATH_LOG_ERR, @@ -468,7 +468,7 @@ void ar6000_copy_cust_data_from_target(HIF_DEVICE * hifDevice, u32 TargetType) if (BMIReadMemory(hifDevice, HOST_INTEREST_ITEM_ADDRESS(TargetType, hi_board_data), - (A_UCHAR *) & eepHeaderAddr, 4) != 0) { + (u8 *) & eepHeaderAddr, 4) != 0) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("BMIReadMemory for reading board data address failed \n")); return; @@ -583,7 +583,7 @@ void ar6000_dump_target_assert_info(HIF_DEVICE * hifDevice, u32 TargetType) /* fetch register dump data */ status = ar6000_ReadDataDiag(hifDevice, regDumpArea, - (A_UCHAR *) & regDumpValues[0], + (u8 *) & regDumpValues[0], regDumpCount * (sizeof(u32))); if (status) { @@ -649,7 +649,7 @@ int ar6000_set_htc_params(HIF_DEVICE * hifDevice, status = BMIWriteMemory(hifDevice, HOST_INTEREST_ITEM_ADDRESS(TargetType, hi_mbox_io_block_sz), - (A_UCHAR *) & blocksizes[1], 4); + (u8 *) & blocksizes[1], 4); if (status) { AR_DEBUG_PRINTF(ATH_LOG_ERR, @@ -669,7 +669,7 @@ int ar6000_set_htc_params(HIF_DEVICE * hifDevice, HOST_INTEREST_ITEM_ADDRESS (TargetType, hi_mbox_isr_yield_limit), - (A_UCHAR *) & MboxIsrYieldValue, + (u8 *) & MboxIsrYieldValue, 4); if (status) { @@ -795,7 +795,7 @@ int ar6002_REV1_reset_force_host(HIF_DEVICE * hifDevice) #endif /* CONFIG_AR6002_REV1_FORCE_HOST */ -void DebugDumpBytes(A_UCHAR * buffer, u16 length, char *pDescription) +void DebugDumpBytes(u8 * buffer, u16 length, char *pDescription) { char stream[60]; char byteOffsetStr[10]; @@ -1021,7 +1021,7 @@ int ar6000_set_hci_bridge_flags(HIF_DEVICE * hifDevice, status = BMIWriteMemory(hifDevice, HOST_INTEREST_ITEM_ADDRESS(TargetType, hi_hci_bridge_flags), - (A_UCHAR *) & Flags, 4); + (u8 *) & Flags, 4); } while (false); diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c index f3028cd..081cb13 100644 --- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c +++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c @@ -416,7 +416,7 @@ int ar6000_set_host_app_area(AR_SOFTC_T * ar) address = TARG_VTOP(ar->arTargetType, data); host_app_area.wmi_protocol_ver = WMI_PROTOCOL_VERSION; if (ar6000_WriteDataDiag(ar->arHifDevice, address, - (A_UCHAR *) & host_app_area, + (u8 *) & host_app_area, sizeof(struct host_app_area_s)) != 0) { return A_ERROR; } @@ -434,7 +434,7 @@ u32 dbglog_get_debug_hdr_ptr(AR_SOFTC_T * ar) TARG_VTOP(ar->arTargetType, HOST_INTEREST_ITEM_ADDRESS(ar, hi_dbglog_hdr)); if ((status = - ar6000_ReadDataDiag(ar->arHifDevice, address, (A_UCHAR *) & param, + ar6000_ReadDataDiag(ar->arHifDevice, address, (u8 *) & param, 4)) != 0) { param = 0; } @@ -555,7 +555,7 @@ int ar6000_dbglog_get_debug_logs(AR_SOFTC_T * ar) address = TARG_VTOP(ar->arTargetType, debug_hdr_ptr); length = 4 /* sizeof(dbuf) */ + 4 /* sizeof(dropped) */ ; A_MEMZERO(data, sizeof(data)); - ar6000_ReadDataDiag(ar->arHifDevice, address, (A_UCHAR *) data, + ar6000_ReadDataDiag(ar->arHifDevice, address, (u8 *) data, length); address = TARG_VTOP(ar->arTargetType, data[0] /* dbuf */ ); firstbuf = address; @@ -566,7 +566,7 @@ int ar6000_dbglog_get_debug_logs(AR_SOFTC_T * ar) 4 /* sizeof(count) */ + 4 /* sizeof(free) */ ; A_MEMZERO(data, sizeof(data)); ar6000_ReadDataDiag(ar->arHifDevice, address, - (A_UCHAR *) & data, length); + (u8 *) & data, length); do { address = @@ -581,7 +581,7 @@ int ar6000_dbglog_get_debug_logs(AR_SOFTC_T * ar) if (0 != ar6000_ReadDataDiag(ar->arHifDevice, address, - (A_UCHAR *) & ar-> + (u8 *) & ar-> log_buffer[ar->log_cnt], length)) { break; @@ -605,7 +605,7 @@ int ar6000_dbglog_get_debug_logs(AR_SOFTC_T * ar) 4 /* sizeof(count) */ + 4 /* sizeof(free) */ ; A_MEMZERO(data, sizeof(data)); if (0 != ar6000_ReadDataDiag(ar->arHifDevice, address, - (A_UCHAR *) & data, + (u8 *) & data, length)) { break; } @@ -833,7 +833,7 @@ ar6000_sysfs_bmi_read(struct file *fp, struct kobject *kobj, if (index == MAX_AR6000) return 0; - if ((BMIRawRead(ar->arHifDevice, (A_UCHAR *) buf, count, true)) != 0) { + if ((BMIRawRead(ar->arHifDevice, (u8 *) buf, count, true)) != 0) { return 0; } @@ -861,7 +861,7 @@ ar6000_sysfs_bmi_write(struct file *fp, struct kobject *kobj, if (index == MAX_AR6000) return 0; - if ((BMIRawWrite(ar->arHifDevice, (A_UCHAR *) buf, count)) != 0) { + if ((BMIRawWrite(ar->arHifDevice, (u8 *) buf, count)) != 0) { return 0; } @@ -921,7 +921,7 @@ static void ar6000_sysfs_bmi_deinit(AR_SOFTC_T * ar) #define AR6002_MAC_ADDRESS_OFFSET 0x0A #define AR6003_MAC_ADDRESS_OFFSET 0x16 static -void calculate_crc(u32 TargetType, A_UCHAR * eeprom_data) +void calculate_crc(u32 TargetType, u8 * eeprom_data) { u16 *ptr_crc; u16 *ptr16_eeprom; @@ -934,10 +934,10 @@ void calculate_crc(u32 TargetType, A_UCHAR * eeprom_data) ptr_crc = (u16 *) eeprom_data; } else if (TargetType == TARGET_TYPE_AR6003) { eeprom_size = 1024; - ptr_crc = (u16 *) ((A_UCHAR *) eeprom_data + 0x04); + ptr_crc = (u16 *) ((u8 *) eeprom_data + 0x04); } else { eeprom_size = 768; - ptr_crc = (u16 *) ((A_UCHAR *) eeprom_data + 0x04); + ptr_crc = (u16 *) ((u8 *) eeprom_data + 0x04); } // Clear the crc @@ -955,20 +955,20 @@ void calculate_crc(u32 TargetType, A_UCHAR * eeprom_data) } static void -ar6000_softmac_update(AR_SOFTC_T * ar, A_UCHAR * eeprom_data, size_t size) +ar6000_softmac_update(AR_SOFTC_T * ar, u8 * eeprom_data, size_t size) { const char *source = "random generated"; const struct firmware *softmac_entry; - A_UCHAR *ptr_mac; + u8 *ptr_mac; switch (ar->arTargetType) { case TARGET_TYPE_AR6002: ptr_mac = - (u8 *) ((A_UCHAR *) eeprom_data + + (u8 *) ((u8 *) eeprom_data + AR6002_MAC_ADDRESS_OFFSET); break; case TARGET_TYPE_AR6003: ptr_mac = - (u8 *) ((A_UCHAR *) eeprom_data + + (u8 *) ((u8 *) eeprom_data + AR6003_MAC_ADDRESS_OFFSET); break; default: @@ -1136,7 +1136,7 @@ ar6000_transfer_bin_file(AR_SOFTC_T * ar, AR6K_BIN_FILE file, u32 address, } #ifdef SOFTMAC_FILE_USED if (file == AR6K_BOARD_DATA_FILE && fw_entry->data) { - ar6000_softmac_update(ar, (A_UCHAR *) fw_entry->data, + ar6000_softmac_update(ar, (u8 *) fw_entry->data, fw_entry->size); } #endif @@ -1173,7 +1173,7 @@ ar6000_transfer_bin_file(AR_SOFTC_T * ar, AR6K_BIN_FILE file, u32 address, bmifn(BMIReadMemory (ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_board_ext_data), - (A_UCHAR *) & board_ext_address, 4)); + (u8 *) & board_ext_address, 4)); AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("Board extended Data download address: 0x%x\n", board_ext_address)); @@ -1186,7 +1186,7 @@ ar6000_transfer_bin_file(AR_SOFTC_T * ar, AR6K_BIN_FILE file, u32 address, status = BMIWriteMemory(ar->arHifDevice, board_ext_address, - (A_UCHAR *) (fw_entry->data + + (u8 *) (fw_entry->data + board_data_size), board_ext_data_size); @@ -1204,7 +1204,7 @@ ar6000_transfer_bin_file(AR_SOFTC_T * ar, AR6K_BIN_FILE file, u32 address, (ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_board_ext_data_initialized), - (A_UCHAR *) & param, 4)); + (u8 *) & param, 4)); } fw_entry_size = board_data_size; } @@ -1212,11 +1212,11 @@ ar6000_transfer_bin_file(AR_SOFTC_T * ar, AR6K_BIN_FILE file, u32 address, if (compressed) { status = BMIFastDownload(ar->arHifDevice, address, - (A_UCHAR *) fw_entry->data, fw_entry_size); + (u8 *) fw_entry->data, fw_entry_size); } else { status = BMIWriteMemory(ar->arHifDevice, address, - (A_UCHAR *) fw_entry->data, fw_entry_size); + (u8 *) fw_entry->data, fw_entry_size); } if (status) { @@ -1238,7 +1238,7 @@ int ar6000_update_bdaddr(AR_SOFTC_T * ar) if (BMIReadMemory(ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_board_data), - (A_UCHAR *) & address, 4) != 0) { + (u8 *) & address, 4) != 0) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("BMIReadMemory for hi_board_data failed\n")); return A_ERROR; @@ -1246,7 +1246,7 @@ int ar6000_update_bdaddr(AR_SOFTC_T * ar) if (BMIReadMemory (ar->arHifDevice, address + BDATA_BDADDR_OFFSET, - (A_UCHAR *) ar->bdaddr, 6) != 0) { + (u8 *) ar->bdaddr, 6) != 0) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("BMIReadMemory for BD address failed\n")); return A_ERROR; @@ -1323,7 +1323,7 @@ int ar6000_sysfs_bmi_get_config(AR_SOFTC_T * ar, u32 mode) (ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_ext_clk_detected), - (A_UCHAR *) & param, 4)); + (u8 *) & param, 4)); } /* LPO_CAL.ENABLE = 1 if no external clk is detected */ @@ -1365,7 +1365,7 @@ int ar6000_sysfs_bmi_get_config(AR_SOFTC_T * ar, u32 mode) (ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_ext_clk_detected), - (A_UCHAR *) & param, 4)); + (u8 *) & param, 4)); /* CLOCK_CONTROL &= ~LF_CLK32 */ address = RTC_BASE_ADDRESS + CLOCK_CONTROL_ADDRESS; @@ -1383,7 +1383,7 @@ int ar6000_sysfs_bmi_get_config(AR_SOFTC_T * ar, u32 mode) bmifn(BMIReadMemory (ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_board_data), - (A_UCHAR *) & address, 4)); + (u8 *) & address, 4)); AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("Board Data download address: 0x%x\n", address)); @@ -1400,7 +1400,7 @@ int ar6000_sysfs_bmi_get_config(AR_SOFTC_T * ar, u32 mode) (ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_board_data_initialized), - (A_UCHAR *) & param, 4)); + (u8 *) & param, 4)); /* Transfer One time Programmable data */ AR6K_DATA_DOWNLOAD_ADDRESS(address, @@ -1449,7 +1449,7 @@ int ar6000_sysfs_bmi_get_config(AR_SOFTC_T * ar, u32 mode) bmifn(BMIWriteMemory (ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_dset_list_head), - (A_UCHAR *) & param, 4)); + (u8 *) & param, 4)); if (ar->arTargetType == TARGET_TYPE_AR6003) { if (ar->arVersion.target_ver == AR6003_REV1_VERSION) { @@ -1463,7 +1463,7 @@ int ar6000_sysfs_bmi_get_config(AR_SOFTC_T * ar, u32 mode) (ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_end_RAM_reserve_sz), - (A_UCHAR *) & param, 4)); + (u8 *) & param, 4)); } /* Restore system sleep */ @@ -1484,7 +1484,7 @@ int ar6000_sysfs_bmi_get_config(AR_SOFTC_T * ar, u32 mode) (ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_dbg_uart_txpin), - (A_UCHAR *) & param, 4)); + (u8 *) & param, 4)); #if (CONFIG_AR600x_DEBUG_UART_TX_PIN == 23) { @@ -1506,7 +1506,7 @@ int ar6000_sysfs_bmi_get_config(AR_SOFTC_T * ar, u32 mode) (ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_hci_uart_support_pins), - (A_UCHAR *) & param, 4)); + (u8 *) & param, 4)); #endif /* ATH6KL_CONFIG_GPIO_BT_RESET */ /* Configure UART flow control polarity */ @@ -1523,7 +1523,7 @@ int ar6000_sysfs_bmi_get_config(AR_SOFTC_T * ar, u32 mode) (ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_hci_uart_pwr_mgmt_params), - (A_UCHAR *) & param, 4)); + (u8 *) & param, 4)); } #endif /* CONFIG_ATH6KL_BT_UART_FC_POLARITY */ } @@ -1549,7 +1549,7 @@ int ar6000_configure_target(AR_SOFTC_T * ar) if (BMIWriteMemory(ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_serial_enable), - (A_UCHAR *) & param, 4) != 0) { + (u8 *) & param, 4) != 0) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("BMIWriteMemory for enableuartprint failed \n")); return A_ERROR; @@ -1562,7 +1562,7 @@ int ar6000_configure_target(AR_SOFTC_T * ar) param = HTC_PROTOCOL_VERSION; if (BMIWriteMemory(ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_app_host_interest), - (A_UCHAR *) & param, 4) != 0) { + (u8 *) & param, 4) != 0) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("BMIWriteMemory for htc version failed \n")); return A_ERROR; @@ -1580,7 +1580,7 @@ int ar6000_configure_target(AR_SOFTC_T * ar) if (BMIReadMemory(ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_option_flag), - (A_UCHAR *) & param, 4) != 0) { + (u8 *) & param, 4) != 0) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("BMIReadMemory for enabletimerwar failed \n")); return A_ERROR; @@ -1591,7 +1591,7 @@ int ar6000_configure_target(AR_SOFTC_T * ar) if (BMIWriteMemory(ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_option_flag), - (A_UCHAR *) & param, 4) != 0) { + (u8 *) & param, 4) != 0) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("BMIWriteMemory for enabletimerwar failed \n")); return A_ERROR; @@ -1606,7 +1606,7 @@ int ar6000_configure_target(AR_SOFTC_T * ar) if (BMIReadMemory(ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_option_flag), - (A_UCHAR *) & param, 4) != 0) { + (u8 *) & param, 4) != 0) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("BMIReadMemory for setting fwmode failed \n")); return A_ERROR; @@ -1617,7 +1617,7 @@ int ar6000_configure_target(AR_SOFTC_T * ar) if (BMIWriteMemory(ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_option_flag), - (A_UCHAR *) & param, 4) != 0) { + (u8 *) & param, 4) != 0) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("BMIWriteMemory for setting fwmode failed \n")); return A_ERROR; @@ -1632,7 +1632,7 @@ int ar6000_configure_target(AR_SOFTC_T * ar) if (BMIReadMemory(ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_option_flag), - (A_UCHAR *) & param, 4) != 0) { + (u8 *) & param, 4) != 0) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("BMIReadMemory for disabling debug logs failed\n")); return A_ERROR; @@ -1643,7 +1643,7 @@ int ar6000_configure_target(AR_SOFTC_T * ar) if (BMIWriteMemory(ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_option_flag), - (A_UCHAR *) & param, 4) != 0) { + (u8 *) & param, 4) != 0) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("BMIWriteMemory for HI_OPTION_DISABLE_DBGLOG\n")); return A_ERROR; @@ -1665,7 +1665,7 @@ int ar6000_configure_target(AR_SOFTC_T * ar) if (BMIWriteMemory(ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_board_ext_data), - (A_UCHAR *) & param, 4) != 0) { + (u8 *) & param, 4) != 0) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("BMIWriteMemory for hi_board_ext_data failed \n")); return A_ERROR; diff --git a/drivers/staging/ath6kl/os/linux/eeprom.c b/drivers/staging/ath6kl/os/linux/eeprom.c index b6c048c..26b5059 100644 --- a/drivers/staging/ath6kl/os/linux/eeprom.c +++ b/drivers/staging/ath6kl/os/linux/eeprom.c @@ -52,7 +52,7 @@ char *p_mac = NULL; // static variables // -static A_UCHAR eeprom_data[EEPROM_SZ]; +static u8 eeprom_data[EEPROM_SZ]; static u32 sys_sleep_reg; static HIF_DEVICE *p_bmi_device; @@ -138,13 +138,13 @@ inline void BMI_write_reg(u32 address, u32 value) /* Read Target memory word and return its value. */ inline void BMI_read_mem(u32 address, u32 * pvalue) { - BMIReadMemory(p_bmi_device, address, (A_UCHAR *) (pvalue), 4); + BMIReadMemory(p_bmi_device, address, (u8 *) (pvalue), 4); } /* Write a word to a Target memory. */ inline void BMI_write_mem(u32 address, u8 * p_data, u32 sz) { - BMIWriteMemory(p_bmi_device, address, (A_UCHAR *) (p_data), sz); + BMIWriteMemory(p_bmi_device, address, (u8 *) (p_data), sz); } /* diff --git a/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h b/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h index e35f80f..be6fd98 100644 --- a/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h +++ b/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h @@ -547,7 +547,7 @@ extern "C" { COMMON_CREDIT_STATE_INFO arCreditStateInfo; bool arWMIControlEpFull; bool dbgLogFetchInProgress; - A_UCHAR log_buffer[DBGLOG_HOST_LOG_BUFFER_SIZE]; + u8 log_buffer[DBGLOG_HOST_LOG_BUFFER_SIZE]; u32 log_cnt; u32 dbglog_init_done; u32 arConnectCtrlFlags; diff --git a/drivers/staging/ath6kl/os/linux/include/athtypes_linux.h b/drivers/staging/ath6kl/os/linux/include/athtypes_linux.h index 3bf4a33..2baa75a 100644 --- a/drivers/staging/ath6kl/os/linux/include/athtypes_linux.h +++ b/drivers/staging/ath6kl/os/linux/include/athtypes_linux.h @@ -45,7 +45,6 @@ typedef u_int32_t A_UINT32; typedef u_int64_t A_UINT64; typedef char A_CHAR; -typedef unsigned char A_UCHAR; typedef unsigned long A_ATH_TIMER; #endif /* _ATHTYPES_LINUX_H_ */ diff --git a/drivers/staging/ath6kl/os/linux/ioctl.c b/drivers/staging/ath6kl/os/linux/ioctl.c index 810cc68..9b941cf 100644 --- a/drivers/staging/ath6kl/os/linux/ioctl.c +++ b/drivers/staging/ath6kl/os/linux/ioctl.c @@ -689,9 +689,9 @@ ar6000_ioctl_tcmd_get_rx_report(struct net_device *dev, buf[1] = ar->tcmdRxRssi; buf[2] = ar->tcmdRxcrcErrPkt; buf[3] = ar->tcmdRxsecErrPkt; - A_MEMCPY(((A_UCHAR *) buf) + (4 * sizeof(u32)), ar->tcmdRateCnt, + A_MEMCPY(((u8 *) buf) + (4 * sizeof(u32)), ar->tcmdRateCnt, sizeof(ar->tcmdRateCnt)); - A_MEMCPY(((A_UCHAR *) buf) + (4 * sizeof(u32)) + + A_MEMCPY(((u8 *) buf) + (4 * sizeof(u32)) + (TCMD_MAX_RATES * sizeof(u16)), ar->tcmdRateCntShortGuard, sizeof(ar->tcmdRateCntShortGuard)); diff --git a/drivers/staging/ath6kl/wlan/src/wlan_node.c b/drivers/staging/ath6kl/wlan/src/wlan_node.c index 3de746b..7dd49ea 100644 --- a/drivers/staging/ath6kl/wlan/src/wlan_node.c +++ b/drivers/staging/ath6kl/wlan/src/wlan_node.c @@ -394,11 +394,11 @@ void wlan_node_table_cleanup(struct ieee80211_node_table *nt) IEEE80211_NODE_LOCK_DESTROY(nt); } -bss_t *wlan_find_Ssidnode(struct ieee80211_node_table *nt, A_UCHAR * pSsid, +bss_t *wlan_find_Ssidnode(struct ieee80211_node_table *nt, u8 * pSsid, u32 ssidLength, bool bIsWPA2, bool bMatchSSID) { bss_t *ni = NULL; - A_UCHAR *pIESsid = NULL; + u8 *pIESsid = NULL; IEEE80211_NODE_LOCK(nt); @@ -502,13 +502,13 @@ bss_t *wlan_node_remove(struct ieee80211_node_table *nt, u8 * bssid) } bss_t *wlan_find_matching_Ssidnode(struct ieee80211_node_table * nt, - A_UCHAR * pSsid, u32 ssidLength, + u8 * pSsid, u32 ssidLength, u32 dot11AuthMode, u32 authMode, u32 pairwiseCryptoType, u32 grpwiseCryptoTyp) { bss_t *ni = NULL; bss_t *best_ni = NULL; - A_UCHAR *pIESsid = NULL; + u8 *pIESsid = NULL; IEEE80211_NODE_LOCK(nt); diff --git a/drivers/staging/ath6kl/wmi/wmi.c b/drivers/staging/ath6kl/wmi/wmi.c index 92767d6..7685822 100644 --- a/drivers/staging/ath6kl/wmi/wmi.c +++ b/drivers/staging/ath6kl/wmi/wmi.c @@ -1395,8 +1395,8 @@ static int wmi_bssInfo_event_rx(struct wmi_t *wmip, u8 * datap, int len) WMI_BSS_INFO_HDR *bih; u8 *buf; u32 nodeCachingAllowed = 1; - A_UCHAR cached_ssid_len = 0; - A_UCHAR cached_ssid_buf[IEEE80211_NWID_LEN] = { 0 }; + u8 cached_ssid_len = 0; + u8 cached_ssid_buf[IEEE80211_NWID_LEN] = { 0 }; u8 beacon_ssid_len = 0; if (len <= sizeof(WMI_BSS_INFO_HDR)) { @@ -1450,7 +1450,7 @@ static int wmi_bssInfo_event_rx(struct wmi_t *wmip, u8 * datap, int len) * but a directed probe response will have it, * so cache the probe-resp-ssid if already present. */ if ((true == is_probe_ssid) && (BEACON_FTYPE == bih->frameType)) { - A_UCHAR *ie_ssid; + u8 *ie_ssid; ie_ssid = bss->ni_cie.ie_ssid; if (ie_ssid && (ie_ssid[1] <= IEEE80211_NWID_LEN) @@ -2372,7 +2372,7 @@ wmi_connect_cmd(struct wmi_t *wmip, NETWORK_TYPE netType, DOT11_AUTH_MODE dot11AuthMode, AUTH_MODE authMode, CRYPTO_TYPE pairwiseCrypto, u8 pairwiseCryptoLen, CRYPTO_TYPE groupCrypto, u8 groupCryptoLen, - int ssidLength, A_UCHAR * ssid, + int ssidLength, u8 * ssid, u8 * bssid, u16 channel, u32 ctrl_flags) { void *osbuf; @@ -2566,7 +2566,7 @@ int wmi_bssfilter_cmd(struct wmi_t *wmip, u8 filter, u32 ieMask) int wmi_probedSsid_cmd(struct wmi_t *wmip, u8 index, u8 flag, - u8 ssidLength, A_UCHAR * ssid) + u8 ssidLength, u8 * ssid) { void *osbuf; WMI_PROBED_SSID_CMD *cmd; @@ -4760,7 +4760,7 @@ int wmi_set_wmm_txop(struct wmi_t *wmip, WMI_TXOP_CFG cfg) } -int wmi_set_country(struct wmi_t *wmip, A_UCHAR * countryCode) +int wmi_set_country(struct wmi_t *wmip, u8 * countryCode) { void *osbuf; WMI_AP_SET_COUNTRY_CMD *cmd; @@ -5287,7 +5287,7 @@ void wmi_set_nodeage(struct wmi_t *wmip, u32 nodeAge) wlan_set_nodeage(&wmip->wmi_scan_table, nodeAge); } -bss_t *wmi_find_Ssidnode(struct wmi_t *wmip, A_UCHAR * pSsid, +bss_t *wmi_find_Ssidnode(struct wmi_t *wmip, u8 * pSsid, u32 ssidLength, bool bIsWPA2, bool bMatchSSID) { bss_t *node = NULL; @@ -6534,7 +6534,7 @@ int wmi_SGI_cmd(struct wmi_t *wmip, u32 sgiMask, u8 sgiPERThreshold) NO_SYNC_WMIFLAG)); } -bss_t *wmi_find_matching_Ssidnode(struct wmi_t * wmip, A_UCHAR * pSsid, +bss_t *wmi_find_matching_Ssidnode(struct wmi_t * wmip, u8 * pSsid, u32 ssidLength, u32 dot11AuthMode, u32 authMode, u32 pairwiseCryptoType, u32 grpwiseCryptoTyp) -- 1.7.4.15.g7811d _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel