* [PATCH 00/20] ath6kl: first series of cleanups
@ 2011-03-11 2:55 Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 01/20] staging: ath6kl: Cast variable to size_t to avoid compile warning Luis R. Rodriguez
` (20 more replies)
0 siblings, 21 replies; 22+ messages in thread
From: Luis R. Rodriguez @ 2011-03-11 2:55 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-wireless, vmehta, naveen.singh, Luis R. Rodriguez
Greg, here's the first series of cleanup patches for ath6kl.
I'm sending only 20, have gone tested by Naveen. I threw in
the patch from Javier which you requested to be changed. I
have some more I'll post after these get merged. These all go:
Acked-by: Naveen Singh <naveen.singh@atheros.com>
Javier Martinez Canillas (1):
staging: ath6kl: Cast variable to size_t to avoid compile warning
Luis R. Rodriguez (19):
ath6kl: s|A_MEMCPY|memcpy|g
ath6kl: s|A_MEMCMP|memcmp|g
ath6kl: remove-typedef: A_UCHAR
ath6kl: remove-typedef AGGR_INFO
ath6kl: remove-typedef AR3K_CONFIG_INFO
ath6kl: remove-typedef AR6000_USER_SETKEYS_INFO
ath6kl: remove-typedef AR6K_ASYNC_REG_IO_BUFFER
ath6kl: remove-typedef AR6K_DEVICE
ath6kl: remove-typedef AR6K_GMBOX_CTRL_REGISTERS
ath6kl: remove-typedef AR6K_GMBOX_INFO
ath6kl: remove-typedef AR6K_HCI_BRIDGE_INFO
ath6kl: remove-typedef AR6K_IRQ_ENABLE_REGISTERS
ath6kl: remove-typedef AR6K_IRQ_PROC_REGISTERS
ath6kl: remove-typedef AR_VIRTUAL_INTERFACE_T
ath6kl: remove-typedef ATHBT_FILTER_INSTANCE
ath6kl: remove-typedef ATH_DEBUG_MASK_DESCRIPTION
ath6kl: remove-typedef BUFFER_PROC_LIST
ath6kl: remove-typedef COMMON_CREDIT_STATE_INFO
ath6kl: remove-typedef DEV_SCATTER_DMA_VIRTUAL_INFO
drivers/staging/ath6kl/bmi/include/bmi_internal.h | 4 +-
drivers/staging/ath6kl/bmi/src/bmi.c | 110 +++++++-------
.../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 | 114 +++++++-------
drivers/staging/ath6kl/htc2/AR6000/ar6k.h | 116 +++++++-------
drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c | 36 ++--
drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c | 44 +++---
.../ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c | 12 +-
drivers/staging/ath6kl/htc2/htc.c | 8 +-
drivers/staging/ath6kl/htc2/htc_internal.h | 4 +-
drivers/staging/ath6kl/htc2/htc_recv.c | 6 +-
drivers/staging/ath6kl/htc2/htc_services.c | 6 +-
drivers/staging/ath6kl/include/a_debug.h | 12 +-
drivers/staging/ath6kl/include/ar3kconfig.h | 6 +-
drivers/staging/ath6kl/include/ar6000_diag.h | 4 +-
drivers/staging/ath6kl/include/athbtfilter.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 | 8 +-
drivers/staging/ath6kl/include/hif.h | 2 +-
drivers/staging/ath6kl/include/wlan_api.h | 4 +-
drivers/staging/ath6kl/include/wmi_api.h | 10 +-
drivers/staging/ath6kl/miscdrv/ar3kconfig.c | 22 ++--
.../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c | 54 ++++----
.../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h | 8 +-
.../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c | 36 ++--
.../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h | 13 +--
drivers/staging/ath6kl/miscdrv/common_drv.c | 38 +++---
drivers/staging/ath6kl/miscdrv/credit_dist.c | 18 +-
drivers/staging/ath6kl/os/linux/ar6000_drv.c | 160 ++++++++++----------
drivers/staging/ath6kl/os/linux/ar6000_pm.c | 2 +-
drivers/staging/ath6kl/os/linux/ar6k_pal.c | 2 +-
drivers/staging/ath6kl/os/linux/cfg80211.c | 44 +++---
drivers/staging/ath6kl/os/linux/eeprom.c | 6 +-
drivers/staging/ath6kl/os/linux/hci_bridge.c | 98 ++++++------
.../staging/ath6kl/os/linux/include/ar6000_drv.h | 10 +-
.../staging/ath6kl/os/linux/include/athdrv_linux.h | 7 +-
.../ath6kl/os/linux/include/athtypes_linux.h | 1 -
.../staging/ath6kl/os/linux/include/osapi_linux.h | 4 -
drivers/staging/ath6kl/os/linux/ioctl.c | 36 ++--
drivers/staging/ath6kl/os/linux/netbuf.c | 8 +-
drivers/staging/ath6kl/os/linux/wireless_ext.c | 34 ++--
drivers/staging/ath6kl/reorder/aggr_rx_internal.h | 4 +-
drivers/staging/ath6kl/reorder/rcv_aggr.c | 44 +++---
drivers/staging/ath6kl/wlan/include/ieee80211.h | 4 +-
drivers/staging/ath6kl/wlan/src/wlan_node.c | 20 ++--
drivers/staging/ath6kl/wmi/wmi.c | 164 ++++++++++----------
51 files changed, 681 insertions(+), 694 deletions(-)
--
1.7.4.15.g7811d
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 01/20] staging: ath6kl: Cast variable to size_t to avoid compile warning
2011-03-11 2:55 [PATCH 00/20] ath6kl: first series of cleanups Luis R. Rodriguez
@ 2011-03-11 2:55 ` Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 02/20] ath6kl: s|A_MEMCPY|memcpy|g Luis R. Rodriguez
` (19 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Luis R. Rodriguez @ 2011-03-11 2:55 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-wireless, vmehta, naveen.singh,
Javier Martinez Canillas, Luis R. Rodriguez
From: Javier Martinez Canillas <martinez.javier@gmail.com>
The min() macro does strict type-checking so use min_t() instead
to silence a compile warning.
Cc: Naveen Singh <naveen.singh@atheros.com>
Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
.../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
index 67e6d5e..55b0633 100644
--- a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
+++ b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
@@ -360,7 +360,7 @@ int PSSendOps(void *arg)
status = 1;
goto complete;
}
- len = min(firmware->size, MAX_BDADDR_FORMAT_LENGTH - 1);
+ len = min_t(size_t, firmware->size, MAX_BDADDR_FORMAT_LENGTH - 1);
memcpy(config_bdaddr, firmware->data, len);
config_bdaddr[len] = '\0';
write_bdaddr(hdev,config_bdaddr,BDADDR_TYPE_STRING);
--
1.7.4.15.g7811d
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 02/20] ath6kl: s|A_MEMCPY|memcpy|g
2011-03-11 2:55 [PATCH 00/20] ath6kl: first series of cleanups Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 01/20] staging: ath6kl: Cast variable to size_t to avoid compile warning Luis R. Rodriguez
@ 2011-03-11 2:55 ` Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 03/20] ath6kl: s|A_MEMCMP|memcmp|g Luis R. Rodriguez
` (18 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Luis R. Rodriguez @ 2011-03-11 2:55 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-wireless, vmehta, naveen.singh, Luis R. Rodriguez
for i in $(find ./drivers/staging/ath6kl/ -name \*.[ch]) ; do \
sed -r -i -e "s/A_MEMCPY/memcpy/g" $i; done
Cc: Naveen Singh <naveen.singh@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/staging/ath6kl/bmi/src/bmi.c | 74 +++++-----
drivers/staging/ath6kl/htc2/AR6000/ar6k.c | 12 +-
drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c | 2 +-
drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c | 8 +-
.../ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c | 2 +-
drivers/staging/ath6kl/htc2/htc.c | 4 +-
drivers/staging/ath6kl/htc2/htc_recv.c | 6 +-
drivers/staging/ath6kl/htc2/htc_services.c | 6 +-
drivers/staging/ath6kl/miscdrv/ar3kconfig.c | 2 +-
drivers/staging/ath6kl/os/linux/ar6000_drv.c | 56 ++++----
drivers/staging/ath6kl/os/linux/ar6k_pal.c | 2 +-
drivers/staging/ath6kl/os/linux/cfg80211.c | 36 +++---
drivers/staging/ath6kl/os/linux/hci_bridge.c | 4 +-
.../staging/ath6kl/os/linux/include/osapi_linux.h | 2 -
drivers/staging/ath6kl/os/linux/ioctl.c | 30 ++--
drivers/staging/ath6kl/os/linux/netbuf.c | 8 +-
drivers/staging/ath6kl/os/linux/wireless_ext.c | 26 ++--
drivers/staging/ath6kl/reorder/rcv_aggr.c | 2 +-
drivers/staging/ath6kl/wlan/include/ieee80211.h | 2 +-
drivers/staging/ath6kl/wlan/src/wlan_node.c | 2 +-
drivers/staging/ath6kl/wmi/wmi.c | 146 ++++++++++----------
21 files changed, 215 insertions(+), 217 deletions(-)
diff --git a/drivers/staging/ath6kl/bmi/src/bmi.c b/drivers/staging/ath6kl/bmi/src/bmi.c
index 49aed8a..1e1e6ee 100644
--- a/drivers/staging/ath6kl/bmi/src/bmi.c
+++ b/drivers/staging/ath6kl/bmi/src/bmi.c
@@ -231,11 +231,11 @@ BMIReadMemory(HIF_DEVICE *device,
{
rxlen = (remaining < BMI_DATASZ_MAX) ? remaining : BMI_DATASZ_MAX;
offset = 0;
- A_MEMCPY(&(pBMICmdBuf[offset]), &cid, sizeof(cid));
+ memcpy(&(pBMICmdBuf[offset]), &cid, sizeof(cid));
offset += sizeof(cid);
- A_MEMCPY(&(pBMICmdBuf[offset]), &address, sizeof(address));
+ memcpy(&(pBMICmdBuf[offset]), &address, sizeof(address));
offset += sizeof(address);
- A_MEMCPY(&(pBMICmdBuf[offset]), &rxlen, sizeof(rxlen));
+ memcpy(&(pBMICmdBuf[offset]), &rxlen, sizeof(rxlen));
offset += sizeof(length);
status = bmiBufferSend(device, pBMICmdBuf, offset);
@@ -248,7 +248,7 @@ BMIReadMemory(HIF_DEVICE *device,
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read from the device\n"));
return A_ERROR;
}
- A_MEMCPY(&buffer[length - remaining], pBMICmdBuf, rxlen);
+ memcpy(&buffer[length - remaining], pBMICmdBuf, rxlen);
remaining -= rxlen; address += rxlen;
}
@@ -300,13 +300,13 @@ BMIWriteMemory(HIF_DEVICE *device,
txlen = (BMI_DATASZ_MAX - header);
}
offset = 0;
- A_MEMCPY(&(pBMICmdBuf[offset]), &cid, sizeof(cid));
+ memcpy(&(pBMICmdBuf[offset]), &cid, sizeof(cid));
offset += sizeof(cid);
- A_MEMCPY(&(pBMICmdBuf[offset]), &address, sizeof(address));
+ memcpy(&(pBMICmdBuf[offset]), &address, sizeof(address));
offset += sizeof(address);
- A_MEMCPY(&(pBMICmdBuf[offset]), &txlen, sizeof(txlen));
+ memcpy(&(pBMICmdBuf[offset]), &txlen, sizeof(txlen));
offset += sizeof(txlen);
- A_MEMCPY(&(pBMICmdBuf[offset]), src, txlen);
+ memcpy(&(pBMICmdBuf[offset]), src, txlen);
offset += txlen;
status = bmiBufferSend(device, pBMICmdBuf, offset);
if (status) {
@@ -345,11 +345,11 @@ BMIExecute(HIF_DEVICE *device,
cid = BMI_EXECUTE;
offset = 0;
- A_MEMCPY(&(pBMICmdBuf[offset]), &cid, sizeof(cid));
+ memcpy(&(pBMICmdBuf[offset]), &cid, sizeof(cid));
offset += sizeof(cid);
- A_MEMCPY(&(pBMICmdBuf[offset]), &address, sizeof(address));
+ memcpy(&(pBMICmdBuf[offset]), &address, sizeof(address));
offset += sizeof(address);
- A_MEMCPY(&(pBMICmdBuf[offset]), param, sizeof(*param));
+ memcpy(&(pBMICmdBuf[offset]), param, sizeof(*param));
offset += sizeof(*param);
status = bmiBufferSend(device, pBMICmdBuf, offset);
if (status) {
@@ -363,7 +363,7 @@ BMIExecute(HIF_DEVICE *device,
return A_ERROR;
}
- A_MEMCPY(param, pBMICmdBuf, sizeof(*param));
+ memcpy(param, pBMICmdBuf, sizeof(*param));
AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Execute: Exit (param: %d)\n", *param));
return 0;
@@ -392,9 +392,9 @@ BMISetAppStart(HIF_DEVICE *device,
cid = BMI_SET_APP_START;
offset = 0;
- A_MEMCPY(&(pBMICmdBuf[offset]), &cid, sizeof(cid));
+ memcpy(&(pBMICmdBuf[offset]), &cid, sizeof(cid));
offset += sizeof(cid);
- A_MEMCPY(&(pBMICmdBuf[offset]), &address, sizeof(address));
+ memcpy(&(pBMICmdBuf[offset]), &address, sizeof(address));
offset += sizeof(address);
status = bmiBufferSend(device, pBMICmdBuf, offset);
if (status) {
@@ -430,9 +430,9 @@ BMIReadSOCRegister(HIF_DEVICE *device,
cid = BMI_READ_SOC_REGISTER;
offset = 0;
- A_MEMCPY(&(pBMICmdBuf[offset]), &cid, sizeof(cid));
+ memcpy(&(pBMICmdBuf[offset]), &cid, sizeof(cid));
offset += sizeof(cid);
- A_MEMCPY(&(pBMICmdBuf[offset]), &address, sizeof(address));
+ memcpy(&(pBMICmdBuf[offset]), &address, sizeof(address));
offset += sizeof(address);
status = bmiBufferSend(device, pBMICmdBuf, offset);
@@ -446,7 +446,7 @@ BMIReadSOCRegister(HIF_DEVICE *device,
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read from the device\n"));
return A_ERROR;
}
- A_MEMCPY(param, pBMICmdBuf, sizeof(*param));
+ memcpy(param, pBMICmdBuf, sizeof(*param));
AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Read SOC Register: Exit (value: %d)\n", *param));
return 0;
@@ -476,11 +476,11 @@ BMIWriteSOCRegister(HIF_DEVICE *device,
cid = BMI_WRITE_SOC_REGISTER;
offset = 0;
- A_MEMCPY(&(pBMICmdBuf[offset]), &cid, sizeof(cid));
+ memcpy(&(pBMICmdBuf[offset]), &cid, sizeof(cid));
offset += sizeof(cid);
- A_MEMCPY(&(pBMICmdBuf[offset]), &address, sizeof(address));
+ memcpy(&(pBMICmdBuf[offset]), &address, sizeof(address));
offset += sizeof(address);
- A_MEMCPY(&(pBMICmdBuf[offset]), ¶m, sizeof(param));
+ memcpy(&(pBMICmdBuf[offset]), ¶m, sizeof(param));
offset += sizeof(param);
status = bmiBufferSend(device, pBMICmdBuf, offset);
if (status) {
@@ -521,15 +521,15 @@ BMIrompatchInstall(HIF_DEVICE *device,
cid = BMI_ROMPATCH_INSTALL;
offset = 0;
- A_MEMCPY(&(pBMICmdBuf[offset]), &cid, sizeof(cid));
+ memcpy(&(pBMICmdBuf[offset]), &cid, sizeof(cid));
offset += sizeof(cid);
- A_MEMCPY(&(pBMICmdBuf[offset]), &ROM_addr, sizeof(ROM_addr));
+ memcpy(&(pBMICmdBuf[offset]), &ROM_addr, sizeof(ROM_addr));
offset += sizeof(ROM_addr);
- A_MEMCPY(&(pBMICmdBuf[offset]), &RAM_addr, sizeof(RAM_addr));
+ memcpy(&(pBMICmdBuf[offset]), &RAM_addr, sizeof(RAM_addr));
offset += sizeof(RAM_addr);
- A_MEMCPY(&(pBMICmdBuf[offset]), &nbytes, sizeof(nbytes));
+ memcpy(&(pBMICmdBuf[offset]), &nbytes, sizeof(nbytes));
offset += sizeof(nbytes);
- A_MEMCPY(&(pBMICmdBuf[offset]), &do_activate, sizeof(do_activate));
+ memcpy(&(pBMICmdBuf[offset]), &do_activate, sizeof(do_activate));
offset += sizeof(do_activate);
status = bmiBufferSend(device, pBMICmdBuf, offset);
if (status) {
@@ -542,7 +542,7 @@ BMIrompatchInstall(HIF_DEVICE *device,
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read from the device\n"));
return A_ERROR;
}
- A_MEMCPY(rompatch_id, pBMICmdBuf, sizeof(*rompatch_id));
+ memcpy(rompatch_id, pBMICmdBuf, sizeof(*rompatch_id));
AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI rompatch Install: (rompatch_id=%d)\n", *rompatch_id));
return 0;
@@ -571,9 +571,9 @@ BMIrompatchUninstall(HIF_DEVICE *device,
cid = BMI_ROMPATCH_UNINSTALL;
offset = 0;
- A_MEMCPY(&(pBMICmdBuf[offset]), &cid, sizeof(cid));
+ memcpy(&(pBMICmdBuf[offset]), &cid, sizeof(cid));
offset += sizeof(cid);
- A_MEMCPY(&(pBMICmdBuf[offset]), &rompatch_id, sizeof(rompatch_id));
+ memcpy(&(pBMICmdBuf[offset]), &rompatch_id, sizeof(rompatch_id));
offset += sizeof(rompatch_id);
status = bmiBufferSend(device, pBMICmdBuf, offset);
if (status) {
@@ -611,12 +611,12 @@ _BMIrompatchChangeActivation(HIF_DEVICE *device,
cid = do_activate ? BMI_ROMPATCH_ACTIVATE : BMI_ROMPATCH_DEACTIVATE;
offset = 0;
- A_MEMCPY(&(pBMICmdBuf[offset]), &cid, sizeof(cid));
+ memcpy(&(pBMICmdBuf[offset]), &cid, sizeof(cid));
offset += sizeof(cid);
- A_MEMCPY(&(pBMICmdBuf[offset]), &rompatch_count, sizeof(rompatch_count));
+ memcpy(&(pBMICmdBuf[offset]), &rompatch_count, sizeof(rompatch_count));
offset += sizeof(rompatch_count);
length = rompatch_count * sizeof(*rompatch_list);
- A_MEMCPY(&(pBMICmdBuf[offset]), rompatch_list, length);
+ memcpy(&(pBMICmdBuf[offset]), rompatch_list, length);
offset += length;
status = bmiBufferSend(device, pBMICmdBuf, offset);
if (status) {
@@ -676,11 +676,11 @@ BMILZData(HIF_DEVICE *device,
txlen = (remaining < (BMI_DATASZ_MAX - header)) ?
remaining : (BMI_DATASZ_MAX - header);
offset = 0;
- A_MEMCPY(&(pBMICmdBuf[offset]), &cid, sizeof(cid));
+ memcpy(&(pBMICmdBuf[offset]), &cid, sizeof(cid));
offset += sizeof(cid);
- A_MEMCPY(&(pBMICmdBuf[offset]), &txlen, sizeof(txlen));
+ memcpy(&(pBMICmdBuf[offset]), &txlen, sizeof(txlen));
offset += sizeof(txlen);
- A_MEMCPY(&(pBMICmdBuf[offset]), &buffer[length - remaining], txlen);
+ memcpy(&(pBMICmdBuf[offset]), &buffer[length - remaining], txlen);
offset += txlen;
status = bmiBufferSend(device, pBMICmdBuf, offset);
if (status) {
@@ -717,9 +717,9 @@ BMILZStreamStart(HIF_DEVICE *device,
cid = BMI_LZ_STREAM_START;
offset = 0;
- A_MEMCPY(&(pBMICmdBuf[offset]), &cid, sizeof(cid));
+ memcpy(&(pBMICmdBuf[offset]), &cid, sizeof(cid));
offset += sizeof(cid);
- A_MEMCPY(&(pBMICmdBuf[offset]), &address, sizeof(address));
+ memcpy(&(pBMICmdBuf[offset]), &address, sizeof(address));
offset += sizeof(address);
status = bmiBufferSend(device, pBMICmdBuf, offset);
if (status) {
@@ -972,7 +972,7 @@ BMIFastDownload(HIF_DEVICE *device, u32 address, A_UCHAR *buffer, u32 length)
if (unalignedBytes) {
/* copy the last word into a zero padded buffer */
- A_MEMCPY(&lastWord, &buffer[lastWordOffset], unalignedBytes);
+ memcpy(&lastWord, &buffer[lastWordOffset], unalignedBytes);
}
status = BMILZData(device, buffer, lastWordOffset);
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k.c b/drivers/staging/ath6kl/htc2/AR6000/ar6k.c
index ff0480b..cf75c20 100644
--- a/drivers/staging/ath6kl/htc2/AR6000/ar6k.c
+++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k.c
@@ -254,7 +254,7 @@ int DevEnableInterrupts(AR6K_DEVICE *pDev)
COUNTER_INT_STATUS_ENABLE_BIT_SET(AR6K_TARGET_DEBUG_INTR_MASK);
/* copy into our temp area */
- A_MEMCPY(®s,&pDev->IrqEnableRegisters,AR6K_IRQ_ENABLE_REGS_SIZE);
+ memcpy(®s,&pDev->IrqEnableRegisters,AR6K_IRQ_ENABLE_REGS_SIZE);
UNLOCK_AR6K(pDev);
@@ -287,7 +287,7 @@ int DevDisableInterrupts(AR6K_DEVICE *pDev)
pDev->IrqEnableRegisters.error_status_enable = 0;
pDev->IrqEnableRegisters.counter_int_status_enable = 0;
/* copy into our temp area */
- A_MEMCPY(®s,&pDev->IrqEnableRegisters,AR6K_IRQ_ENABLE_REGS_SIZE);
+ memcpy(®s,&pDev->IrqEnableRegisters,AR6K_IRQ_ENABLE_REGS_SIZE);
UNLOCK_AR6K(pDev);
@@ -419,7 +419,7 @@ static int DevDoEnableDisableRecvNormal(AR6K_DEVICE *pDev, bool EnableRecv, bool
}
/* copy into our temp area */
- A_MEMCPY(®s,&pDev->IrqEnableRegisters,AR6K_IRQ_ENABLE_REGS_SIZE);
+ memcpy(®s,&pDev->IrqEnableRegisters,AR6K_IRQ_ENABLE_REGS_SIZE);
UNLOCK_AR6K(pDev);
do {
@@ -435,7 +435,7 @@ static int DevDoEnableDisableRecvNormal(AR6K_DEVICE *pDev, bool EnableRecv, bool
}
/* copy values to write to our async I/O buffer */
- A_MEMCPY(pIOPacket->pBuffer,®s,AR6K_IRQ_ENABLE_REGS_SIZE);
+ memcpy(pIOPacket->pBuffer,®s,AR6K_IRQ_ENABLE_REGS_SIZE);
/* stick in our completion routine when the I/O operation completes */
pIOPacket->Completion = DevDoEnableDisableRecvAsyncHandler;
@@ -635,10 +635,10 @@ int DevCopyScatterListToFromDMABuffer(HIF_SCATTER_REQ *pReq, bool FromDMA)
if (FromDMA) {
/* from DMA buffer */
- A_MEMCPY(pReq->ScatterList[i].pBuffer, pDMABuffer , length);
+ memcpy(pReq->ScatterList[i].pBuffer, pDMABuffer , length);
} else {
/* to DMA buffer */
- A_MEMCPY(pDMABuffer, pReq->ScatterList[i].pBuffer, length);
+ memcpy(pDMABuffer, pReq->ScatterList[i].pBuffer, length);
}
pDMABuffer += length;
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c b/drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
index 4517bef..bee4850 100644
--- a/drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
+++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
@@ -752,7 +752,7 @@ void DumpAR6KDevState(AR6K_DEVICE *pDev)
LOCK_AR6K(pDev);
/* copy into our temp area */
- A_MEMCPY(®s,&pDev->IrqEnableRegisters,AR6K_IRQ_ENABLE_REGS_SIZE);
+ memcpy(®s,&pDev->IrqEnableRegisters,AR6K_IRQ_ENABLE_REGS_SIZE);
UNLOCK_AR6K(pDev);
/* load the register table from the device */
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c b/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c
index d58e418..46bcb27 100644
--- a/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c
+++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c
@@ -93,7 +93,7 @@ static int DevGMboxCounterEnableDisable(AR6K_DEVICE *pDev, GMBOX_IRQ_ACTION_TYPE
~(COUNTER_INT_STATUS_ENABLE_BIT_SET(1 << AR6K_GMBOX_CREDIT_COUNTER));
}
/* copy into our temp area */
- A_MEMCPY(®s,&pDev->IrqEnableRegisters,AR6K_IRQ_ENABLE_REGS_SIZE);
+ memcpy(®s,&pDev->IrqEnableRegisters,AR6K_IRQ_ENABLE_REGS_SIZE);
UNLOCK_AR6K(pDev);
@@ -110,7 +110,7 @@ static int DevGMboxCounterEnableDisable(AR6K_DEVICE *pDev, GMBOX_IRQ_ACTION_TYPE
}
/* copy values to write to our async I/O buffer */
- A_MEMCPY(pIOPacket->pBuffer,&pDev->IrqEnableRegisters,AR6K_IRQ_ENABLE_REGS_SIZE);
+ memcpy(pIOPacket->pBuffer,&pDev->IrqEnableRegisters,AR6K_IRQ_ENABLE_REGS_SIZE);
/* stick in our completion routine when the I/O operation completes */
pIOPacket->Completion = DevGMboxIRQActionAsyncHandler;
@@ -216,7 +216,7 @@ int DevGMboxIRQAction(AR6K_DEVICE *pDev, GMBOX_IRQ_ACTION_TYPE IrqAction, bool A
}
/* copy values to write to our async I/O buffer */
- A_MEMCPY(pIOPacket->pBuffer,GMboxIntControl,sizeof(GMboxIntControl));
+ memcpy(pIOPacket->pBuffer,GMboxIntControl,sizeof(GMboxIntControl));
/* stick in our completion routine when the I/O operation completes */
pIOPacket->Completion = DevGMboxIRQActionAsyncHandler;
@@ -667,7 +667,7 @@ int DevGMboxRecvLookAheadPeek(AR6K_DEVICE *pDev, u8 *pLookAheadBuffer, int *pLoo
if (procRegs.gmbox_rx_avail > 0) {
int bytes = procRegs.gmbox_rx_avail > maxCopy ? maxCopy : procRegs.gmbox_rx_avail;
- A_MEMCPY(pLookAheadBuffer,&procRegs.rx_gmbox_lookahead_alias[0],bytes);
+ memcpy(pLookAheadBuffer,&procRegs.rx_gmbox_lookahead_alias[0],bytes);
*pLookAheadBytes = bytes;
}
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c b/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c
index cddb939..177f04d 100644
--- a/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c
+++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c
@@ -961,7 +961,7 @@ HCI_TRANSPORT_HANDLE HCI_TransportAttach(void *HTCHandle, HCI_TRANSPORT_CONFIG_I
break;
}
- A_MEMCPY(&pProtocol->HCIConfig, pInfo, sizeof(HCI_TRANSPORT_CONFIG_INFO));
+ memcpy(&pProtocol->HCIConfig, pInfo, sizeof(HCI_TRANSPORT_CONFIG_INFO));
A_ASSERT(pProtocol->HCIConfig.pHCIPktRecv != NULL);
A_ASSERT(pProtocol->HCIConfig.pHCISendComplete != NULL);
diff --git a/drivers/staging/ath6kl/htc2/htc.c b/drivers/staging/ath6kl/htc2/htc.c
index e7adc45..c200cfd 100644
--- a/drivers/staging/ath6kl/htc2/htc.c
+++ b/drivers/staging/ath6kl/htc2/htc.c
@@ -130,7 +130,7 @@ HTC_HANDLE HTCCreate(void *hif_handle, HTC_INIT_INFO *pInfo)
target->Device.MessagePendingCallback = HTCRecvMessagePendingHandler;
target->EpWaitingForBuffers = ENDPOINT_MAX;
- A_MEMCPY(&target->HTCInitInfo,pInfo,sizeof(HTC_INIT_INFO));
+ memcpy(&target->HTCInitInfo,pInfo,sizeof(HTC_INIT_INFO));
ResetEndpointStates(target);
@@ -556,7 +556,7 @@ bool HTCGetEndpointStatistics(HTC_HANDLE HTCHandle,
if (sample) {
A_ASSERT(pStats != NULL);
/* return the stats to the caller */
- A_MEMCPY(pStats, &target->EndPoint[Endpoint].EndPointStats, sizeof(HTC_ENDPOINT_STATS));
+ memcpy(pStats, &target->EndPoint[Endpoint].EndPointStats, sizeof(HTC_ENDPOINT_STATS));
}
if (clearStats) {
diff --git a/drivers/staging/ath6kl/htc2/htc_recv.c b/drivers/staging/ath6kl/htc2/htc_recv.c
index 3445475..daa6efc 100644
--- a/drivers/staging/ath6kl/htc2/htc_recv.c
+++ b/drivers/staging/ath6kl/htc2/htc_recv.c
@@ -346,7 +346,7 @@ static int HTCProcessRecvHeader(HTC_TARGET *target,
}
#ifdef HTC_CAPTURE_LAST_FRAME
- A_MEMCPY(target->LastTrailer, (pBuf + HTC_HDR_LENGTH + payloadLen - temp), temp);
+ memcpy(target->LastTrailer, (pBuf + HTC_HDR_LENGTH + payloadLen - temp), temp);
target->LastTrailerLength = temp;
#endif
/* trim length by trailer bytes */
@@ -372,7 +372,7 @@ static int HTCProcessRecvHeader(HTC_TARGET *target,
#endif
} else {
#ifdef HTC_CAPTURE_LAST_FRAME
- A_MEMCPY(&target->LastFrameHdr,pBuf,sizeof(HTC_FRAME_HDR));
+ memcpy(&target->LastFrameHdr,pBuf,sizeof(HTC_FRAME_HDR));
#endif
if (AR_DEBUG_LVL_CHECK(ATH_DEBUG_RECV)) {
if (pPacket->ActualLength > 0) {
@@ -1155,7 +1155,7 @@ int HTCRecvMessagePendingHandler(void *Context, u32 MsgLookAheads[], int NumLook
}
/* on first entry copy the lookaheads into our temp array for processing */
- A_MEMCPY(lookAheads, MsgLookAheads, (sizeof(u32)) * NumLookAheads);
+ memcpy(lookAheads, MsgLookAheads, (sizeof(u32)) * NumLookAheads);
while (true) {
diff --git a/drivers/staging/ath6kl/htc2/htc_services.c b/drivers/staging/ath6kl/htc2/htc_services.c
index 9ddf32c..61a332e 100644
--- a/drivers/staging/ath6kl/htc2/htc_services.c
+++ b/drivers/staging/ath6kl/htc2/htc_services.c
@@ -83,7 +83,7 @@ int HTCSendSetupComplete(HTC_TARGET *target)
setupFlags |= HTC_SETUP_COMPLETE_FLAGS_ENABLE_BUNDLE_RECV;
pSetupCompleteEx->MaxMsgsPerBundledRecv = target->MaxMsgPerBundle;
}
- A_MEMCPY(&pSetupCompleteEx->SetupFlags, &setupFlags, sizeof(pSetupCompleteEx->SetupFlags));
+ memcpy(&pSetupCompleteEx->SetupFlags, &setupFlags, sizeof(pSetupCompleteEx->SetupFlags));
SET_HTC_PACKET_INFO_TX(pSendPacket,
NULL,
(u8 *)pSetupCompleteEx,
@@ -166,7 +166,7 @@ int HTCConnectService(HTC_HANDLE HTCHandle,
if ((pConnectReq->pMetaData != NULL) &&
(pConnectReq->MetaDataLength <= HTC_SERVICE_META_DATA_MAX_LENGTH)) {
/* copy meta data into message buffer (after header ) */
- A_MEMCPY((u8 *)pConnectMsg + sizeof(HTC_CONNECT_SERVICE_MSG),
+ memcpy((u8 *)pConnectMsg + sizeof(HTC_CONNECT_SERVICE_MSG),
pConnectReq->pMetaData,
pConnectReq->MetaDataLength);
pConnectMsg->ServiceMetaLength = pConnectReq->MetaDataLength;
@@ -224,7 +224,7 @@ int HTCConnectService(HTC_HANDLE HTCHandle,
/* caller supplied a buffer and the target responded with data */
int copyLength = min((int)pConnectResp->BufferLength, (int)pResponseMsg->ServiceMetaLength);
/* copy the meta data */
- A_MEMCPY(pConnectResp->pMetaData,
+ memcpy(pConnectResp->pMetaData,
((u8 *)pResponseMsg) + sizeof(HTC_CONNECT_SERVICE_RESPONSE_MSG),
copyLength);
pConnectResp->ActualLength = copyLength;
diff --git a/drivers/staging/ath6kl/miscdrv/ar3kconfig.c b/drivers/staging/ath6kl/miscdrv/ar3kconfig.c
index 29873ac..005b3ba 100644
--- a/drivers/staging/ath6kl/miscdrv/ar3kconfig.c
+++ b/drivers/staging/ath6kl/miscdrv/ar3kconfig.c
@@ -153,7 +153,7 @@ int SendHCICommandWaitCommandComplete(AR3K_CONFIG_INFO *pConfig,
opCodeBytes[1] = pHCICommand[HCI_CMD_OPCODE_BYTE_HI_OFFSET];
/* copy HCI command */
- A_MEMCPY(pBuffer + pConfig->pHCIProps->HeadRoom,pHCICommand,CmdLength);
+ memcpy(pBuffer + pConfig->pHCIProps->HeadRoom,pHCICommand,CmdLength);
/* send command */
status = SendHCICommand(pConfig,
pBuffer + pConfig->pHCIProps->HeadRoom,
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
index 2148381..2111e99 100644
--- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c
+++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
@@ -2280,7 +2280,7 @@ ar6000_init_control_info(AR_SOFTC_T *ar)
ar->ap_profile_flag = 0;
A_NETBUF_QUEUE_INIT(&ar->mcastpsq);
- A_MEMCPY(ar->ap_country_code, DEF_AP_COUNTRY_CODE, 3);
+ memcpy(ar->ap_country_code, DEF_AP_COUNTRY_CODE, 3);
ar->ap_wmode = DEF_AP_WMODE_G;
ar->ap_dtim_period = DEF_AP_DTIM;
ar->ap_beacon_interval = DEF_BEACON_INTERVAL;
@@ -2875,7 +2875,7 @@ ar6000_channelList_rx(void *devt, s8 numChan, u16 *chanList)
{
AR_SOFTC_T *ar = (AR_SOFTC_T *)devt;
- A_MEMCPY(ar->arChannelList, chanList, numChan * sizeof (u16));
+ memcpy(ar->arChannelList, chanList, numChan * sizeof (u16));
ar->arNumChannels = numChan;
wake_up(&arEvent);
@@ -2914,7 +2914,7 @@ u8 ar6000_ibss_map_epid(struct sk_buff *skb, struct net_device *dev, u32 *mapNo)
A_ASSERT(ar->arNodeNum <= MAX_NODE_NUM);
}
- A_MEMCPY(ar->arNodeMap[eptMap].macAddress, macHdr->dstMac, IEEE80211_ADDR_LEN);
+ memcpy(ar->arNodeMap[eptMap].macAddress, macHdr->dstMac, IEEE80211_ADDR_LEN);
for (i = ENDPOINT_2; i <= ENDPOINT_5; i ++) {
if (!ar->arTxPending[i]) {
@@ -3118,7 +3118,7 @@ ar6000_data_tx(struct sk_buff *skb, struct net_device *dev)
break;
}
A_NETBUF_PUT(newbuf, len);
- A_MEMCPY(A_NETBUF_DATA(newbuf), A_NETBUF_DATA(skb), len);
+ memcpy(A_NETBUF_DATA(newbuf), A_NETBUF_DATA(skb), len);
A_NETBUF_FREE(skb);
skb = newbuf;
/* fall through and assemble header */
@@ -4239,7 +4239,7 @@ ar6000_ready_event(void *devt, u8 *datap, u8 phyCap, u32 sw_ver, u32 abi_ver)
AR_SOFTC_T *ar = (AR_SOFTC_T *)devt;
struct net_device *dev = ar->arNetDev;
- A_MEMCPY(dev->dev_addr, datap, AR6000_ETH_ADDR_LEN);
+ memcpy(dev->dev_addr, datap, AR6000_ETH_ADDR_LEN);
AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("mac address = %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n",
dev->dev_addr[0], dev->dev_addr[1],
dev->dev_addr[2], dev->dev_addr[3],
@@ -4260,8 +4260,8 @@ add_new_sta(AR_SOFTC_T *ar, u8 *mac, u16 aid, u8 *wpaie,
{
u8 free_slot=aid-1;
- A_MEMCPY(ar->sta_list[free_slot].mac, mac, ATH_MAC_LEN);
- A_MEMCPY(ar->sta_list[free_slot].wpa_ie, wpaie, ielen);
+ memcpy(ar->sta_list[free_slot].mac, mac, ATH_MAC_LEN);
+ memcpy(ar->sta_list[free_slot].wpa_ie, wpaie, ielen);
ar->sta_list[free_slot].aid = aid;
ar->sta_list[free_slot].keymgmt = keymgmt;
ar->sta_list[free_slot].ucipher = ucipher;
@@ -4383,7 +4383,7 @@ skip_key:
/* Send event to application */
A_MEMZERO(&wrqu, sizeof(wrqu));
- A_MEMCPY(wrqu.addr.sa_data, bssid, ATH_MAC_LEN);
+ memcpy(wrqu.addr.sa_data, bssid, ATH_MAC_LEN);
wireless_send_event(ar->arNetDev, IWEVREGISTERED, &wrqu, NULL);
/* In case the queue is stopped when we switch modes, this will
* wake it up
@@ -4400,7 +4400,7 @@ skip_key:
assocInfo);
#endif /* ATH6K_CONFIG_CFG80211 */
- A_MEMCPY(ar->arBssid, bssid, sizeof(ar->arBssid));
+ memcpy(ar->arBssid, bssid, sizeof(ar->arBssid));
ar->arBssChannel = channel;
A_PRINTF("AR6000 connected event on freq %d ", channel);
@@ -4543,7 +4543,7 @@ skip_key:
reconnect_flag = 0;
A_MEMZERO(&wrqu, sizeof(wrqu));
- A_MEMCPY(wrqu.addr.sa_data, bssid, IEEE80211_ADDR_LEN);
+ memcpy(wrqu.addr.sa_data, bssid, IEEE80211_ADDR_LEN);
wrqu.addr.sa_family = ARPHRD_ETHER;
wireless_send_event(ar->arNetDev, SIOCGIWAP, &wrqu, NULL);
if ((ar->arNetworkType == ADHOC_NETWORK) && ar->arIbssPsEnable) {
@@ -4653,7 +4653,7 @@ ar6000_disconnect_event(AR_SOFTC_T *ar, u8 reason, u8 *bssid,
if(!IS_MAC_BCAST(bssid)) {
/* Send event to application */
A_MEMZERO(&wrqu, sizeof(wrqu));
- A_MEMCPY(wrqu.addr.sa_data, bssid, ATH_MAC_LEN);
+ memcpy(wrqu.addr.sa_data, bssid, ATH_MAC_LEN);
wireless_send_event(ar->arNetDev, IWEVEXPIRED, &wrqu, NULL);
}
@@ -4826,7 +4826,7 @@ ar6000_hci_event_rcv_evt(struct ar6_softc *ar, WMI_HCI_EVENT *cmd)
*/
*((short *)buf) = WMI_HCI_EVENT_EVENTID;
buf += sizeof(int);
- A_MEMCPY(buf, cmd->buf, cmd->evt_buf_sz);
+ memcpy(buf, cmd->buf, cmd->evt_buf_sz);
if(ar6k_pal_config_g.fpar6k_pal_recv_pkt)
{
@@ -4880,7 +4880,7 @@ ar6000_neighborReport_event(AR_SOFTC_T *ar, int numAps, WMI_NEIGHBOR_INFO *info)
A_MEMZERO(pmkcand, sizeof(struct iw_pmkid_cand));
pmkcand->index = i;
pmkcand->flags = info->bssFlags;
- A_MEMCPY(pmkcand->bssid.sa_data, info->bssid, ATH_MAC_LEN);
+ memcpy(pmkcand->bssid.sa_data, info->bssid, ATH_MAC_LEN);
wrqu.data.length = sizeof(struct iw_pmkid_cand);
wireless_send_event(ar->arNetDev, IWEVPMKIDCAND, &wrqu, (char *)pmkcand);
A_FREE(pmkcand);
@@ -5302,9 +5302,9 @@ ar6000_bssInfo_event_rx(AR_SOFTC_T *ar, u8 *datap, int len)
if ((skb = A_NETBUF_ALLOC_RAW(len)) != NULL) {
A_NETBUF_PUT(skb, len);
- A_MEMCPY(A_NETBUF_DATA(skb), datap, len);
+ memcpy(A_NETBUF_DATA(skb), datap, len);
skb->dev = ar->arNetDev;
- A_MEMCPY(skb_mac_header(skb), A_NETBUF_DATA(skb), 6);
+ memcpy(skb_mac_header(skb), A_NETBUF_DATA(skb), 6);
skb->ip_summed = CHECKSUM_NONE;
skb->pkt_type = PACKET_OTHERHOST;
skb->protocol = __constant_htons(0x0019);
@@ -5468,19 +5468,19 @@ ar6000_btcoex_config_event(struct ar6_softc *ar, u8 *ptr, u32 len)
switch (pBtcoexConfig->btProfileType) {
case WMI_BTCOEX_BT_PROFILE_SCO:
- A_MEMCPY(&pArbtcoexConfig->info.scoConfigCmd, &pBtcoexConfig->info.scoConfigCmd,
+ memcpy(&pArbtcoexConfig->info.scoConfigCmd, &pBtcoexConfig->info.scoConfigCmd,
sizeof(WMI_SET_BTCOEX_SCO_CONFIG_CMD));
break;
case WMI_BTCOEX_BT_PROFILE_A2DP:
- A_MEMCPY(&pArbtcoexConfig->info.a2dpConfigCmd, &pBtcoexConfig->info.a2dpConfigCmd,
+ memcpy(&pArbtcoexConfig->info.a2dpConfigCmd, &pBtcoexConfig->info.a2dpConfigCmd,
sizeof(WMI_SET_BTCOEX_A2DP_CONFIG_CMD));
break;
case WMI_BTCOEX_BT_PROFILE_ACLCOEX:
- A_MEMCPY(&pArbtcoexConfig->info.aclcoexConfig, &pBtcoexConfig->info.aclcoexConfig,
+ memcpy(&pArbtcoexConfig->info.aclcoexConfig, &pBtcoexConfig->info.aclcoexConfig,
sizeof(WMI_SET_BTCOEX_ACLCOEX_CONFIG_CMD));
break;
case WMI_BTCOEX_BT_PROFILE_INQUIRY_PAGE:
- A_MEMCPY(&pArbtcoexConfig->info.btinquiryPageConfigCmd, &pBtcoexConfig->info.btinquiryPageConfigCmd,
+ memcpy(&pArbtcoexConfig->info.btinquiryPageConfigCmd, &pBtcoexConfig->info.btinquiryPageConfigCmd,
sizeof(WMI_SET_BTCOEX_ACLCOEX_CONFIG_CMD));
break;
}
@@ -5497,7 +5497,7 @@ ar6000_btcoex_stats_event(struct ar6_softc *ar, u8 *ptr, u32 len)
AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("AR6000 BTCOEX CONFIG EVENT \n"));
- A_MEMCPY(&ar->arBtcoexStats, pBtcoexStats, sizeof(WMI_BTCOEX_STATS_EVENT));
+ memcpy(&ar->arBtcoexStats, pBtcoexStats, sizeof(WMI_BTCOEX_STATS_EVENT));
if (ar->statsUpdatePending) {
ar->statsUpdatePending = false;
@@ -5596,8 +5596,8 @@ void ar6000_send_event_to_app(AR_SOFTC_T *ar, u16 eventId,
}
A_MEMZERO(buf, size);
- A_MEMCPY(buf, &eventId, EVENT_ID_LEN);
- A_MEMCPY(buf+EVENT_ID_LEN, datap, len);
+ memcpy(buf, &eventId, EVENT_ID_LEN);
+ memcpy(buf+EVENT_ID_LEN, datap, len);
//AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("event ID = %d,len = %d\n",*(u16 *)buf, size));
A_MEMZERO(&wrqu, sizeof(wrqu));
@@ -5641,8 +5641,8 @@ void ar6000_send_generic_event_to_app(AR_SOFTC_T *ar, u16 eventId,
}
A_MEMZERO(buf, size);
- A_MEMCPY(buf, &eventId, EVENT_ID_LEN);
- A_MEMCPY(buf+EVENT_ID_LEN, datap, len);
+ memcpy(buf, &eventId, EVENT_ID_LEN);
+ memcpy(buf+EVENT_ID_LEN, datap, len);
A_MEMZERO(&wrqu, sizeof(wrqu));
wrqu.data.length = size;
@@ -5989,7 +5989,7 @@ void ap_wapi_rekey_event(AR_SOFTC_T *ar, u8 type, u8 *mac)
strcpy(buf, "WAPI_REKEY");
buf[10] = type;
- A_MEMCPY(&buf[11], mac, ATH_MAC_LEN);
+ memcpy(&buf[11], mac, ATH_MAC_LEN);
A_MEMZERO(&wrqu, sizeof(wrqu));
wrqu.data.length = 10+1+ATH_MAC_LEN;
@@ -6121,7 +6121,7 @@ ar6000_ap_mode_profile_commit(struct ar6_softc *ar)
A_MEMZERO(&p,sizeof(p));
p.ssidLength = ar->arSsidLen;
- A_MEMCPY(p.ssid,ar->arSsid,p.ssidLength);
+ memcpy(p.ssid,ar->arSsid,p.ssidLength);
p.channel = ar->arChannelHint;
p.networkType = ar->arNetworkType;
@@ -6238,7 +6238,7 @@ ar6000_ap_mode_get_wpa_ie(struct ar6_softc *ar, struct ieee80211req_wpaie *wpaie
A_MEMZERO(wpaie->rsn_ie, IEEE80211_MAX_IE);
if(conn) {
- A_MEMCPY(wpaie->wpa_ie, conn->wpa_ie, IEEE80211_MAX_IE);
+ memcpy(wpaie->wpa_ie, conn->wpa_ie, IEEE80211_MAX_IE);
}
return 0;
@@ -6453,7 +6453,7 @@ int ar6000_create_ap_interface(AR_SOFTC_T *ar, char *ap_ifname)
arApNetDev = dev;
/* Copy the MAC address */
- A_MEMCPY(dev->dev_addr, ar->arNetDev->dev_addr, AR6000_ETH_ADDR_LEN);
+ memcpy(dev->dev_addr, ar->arNetDev->dev_addr, AR6000_ETH_ADDR_LEN);
return 0;
}
diff --git a/drivers/staging/ath6kl/os/linux/ar6k_pal.c b/drivers/staging/ath6kl/os/linux/ar6k_pal.c
index 831b2e3..fee7cb9 100644
--- a/drivers/staging/ath6kl/os/linux/ar6k_pal.c
+++ b/drivers/staging/ath6kl/os/linux/ar6k_pal.c
@@ -215,7 +215,7 @@ static int btpal_send_frame(struct sk_buff *skb)
bt_cb(txSkb)->pkt_type = bt_cb(skb)->pkt_type;
txSkb->dev = (void *)pHciPalInfo->hdev;
skb_reserve(txSkb, TX_PACKET_RSV_OFFSET + WMI_MAX_TX_META_SZ + sizeof(WMI_DATA_HDR));
- A_MEMCPY(txSkb->data, skb->data, skb->len);
+ memcpy(txSkb->data, skb->data, skb->len);
skb_put(txSkb,skb->len);
/* Add WMI packet type */
osbuf = (void *)txSkb;
diff --git a/drivers/staging/ath6kl/os/linux/cfg80211.c b/drivers/staging/ath6kl/os/linux/cfg80211.c
index 20b08c0..415b253 100644
--- a/drivers/staging/ath6kl/os/linux/cfg80211.c
+++ b/drivers/staging/ath6kl/os/linux/cfg80211.c
@@ -324,7 +324,7 @@ ar6k_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
A_MEMZERO(ar->arSsid, sizeof(ar->arSsid));
ar->arSsidLen = sme->ssid_len;
- A_MEMCPY(ar->arSsid, sme->ssid, sme->ssid_len);
+ memcpy(ar->arSsid, sme->ssid, sme->ssid_len);
if(sme->channel){
ar->arChannelHint = sme->channel->center_freq;
@@ -333,7 +333,7 @@ ar6k_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
A_MEMZERO(ar->arReqBssid, sizeof(ar->arReqBssid));
if(sme->bssid){
if(A_MEMCMP(&sme->bssid, bcast_mac, AR6000_ETH_ADDR_LEN)) {
- A_MEMCPY(ar->arReqBssid, sme->bssid, sizeof(ar->arReqBssid));
+ memcpy(ar->arReqBssid, sme->bssid, sizeof(ar->arReqBssid));
}
}
@@ -365,7 +365,7 @@ ar6k_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
key = &ar->keys[sme->key_idx];
key->key_len = sme->key_len;
- A_MEMCPY(key->key, sme->key, key->key_len);
+ memcpy(key->key, sme->key, key->key_len);
key->cipher = ar->arPairwiseCrypto;
ar->arDefTxKeyIndex = sme->key_idx;
@@ -493,7 +493,7 @@ ar6k_cfg80211_connect_event(AR_SOFTC_T *ar, u16 channel,
if(ptr_ie_buf) {
*ptr_ie_buf++ = WLAN_EID_SSID;
*ptr_ie_buf++ = ar->arSsidLen;
- A_MEMCPY(ptr_ie_buf, ar->arSsid, ar->arSsidLen);
+ memcpy(ptr_ie_buf, ar->arSsid, ar->arSsidLen);
ptr_ie_buf +=ar->arSsidLen;
*ptr_ie_buf++ = WLAN_EID_IBSS_PARAMS;
@@ -511,11 +511,11 @@ ar6k_cfg80211_connect_event(AR_SOFTC_T *ar, u16 channel,
if(WEP_CRYPT == ar->arPairwiseCrypto) {
capability |= IEEE80211_CAPINFO_PRIVACY;
}
- A_MEMCPY(source_mac, ar->arNetDev->dev_addr, ATH_MAC_LEN);
+ memcpy(source_mac, ar->arNetDev->dev_addr, ATH_MAC_LEN);
ptr_ie_buf = ie_buf;
} else {
capability = *(u16 *)(&assocInfo[beaconIeLen]);
- A_MEMCPY(source_mac, bssid, ATH_MAC_LEN);
+ memcpy(source_mac, bssid, ATH_MAC_LEN);
ptr_ie_buf = assocReqIe;
ie_buf_len = assocReqLen;
}
@@ -534,12 +534,12 @@ ar6k_cfg80211_connect_event(AR_SOFTC_T *ar, u16 channel,
A_MEMZERO(ieeemgmtbuf, size);
mgmt = (struct ieee80211_mgmt *)ieeemgmtbuf;
mgmt->frame_control = (IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_BEACON);
- A_MEMCPY(mgmt->da, bcast_mac, ATH_MAC_LEN);
- A_MEMCPY(mgmt->sa, source_mac, ATH_MAC_LEN);
- A_MEMCPY(mgmt->bssid, bssid, ATH_MAC_LEN);
+ memcpy(mgmt->da, bcast_mac, ATH_MAC_LEN);
+ memcpy(mgmt->sa, source_mac, ATH_MAC_LEN);
+ memcpy(mgmt->bssid, bssid, ATH_MAC_LEN);
mgmt->u.beacon.beacon_int = beaconInterval;
mgmt->u.beacon.capab_info = capability;
- A_MEMCPY(mgmt->u.beacon.variable, ptr_ie_buf, ie_buf_len);
+ memcpy(mgmt->u.beacon.variable, ptr_ie_buf, ie_buf_len);
ibss_channel = ieee80211_get_channel(ar->wdev->wiphy, (int)channel);
@@ -712,10 +712,10 @@ ar6k_cfg80211_scan_node(void *arg, bss_t *ni)
cfg80211 needs it, for time being just filling the da, sa and bssid fields alone.
*/
mgmt = (struct ieee80211_mgmt *)ieeemgmtbuf;
- A_MEMCPY(mgmt->da, bcast_mac, ATH_MAC_LEN);
- A_MEMCPY(mgmt->sa, ni->ni_macaddr, ATH_MAC_LEN);
- A_MEMCPY(mgmt->bssid, ni->ni_macaddr, ATH_MAC_LEN);
- A_MEMCPY(ieeemgmtbuf + offsetof(struct ieee80211_mgmt, u),
+ memcpy(mgmt->da, bcast_mac, ATH_MAC_LEN);
+ memcpy(mgmt->sa, ni->ni_macaddr, ATH_MAC_LEN);
+ memcpy(mgmt->bssid, ni->ni_macaddr, ATH_MAC_LEN);
+ memcpy(ieeemgmtbuf + offsetof(struct ieee80211_mgmt, u),
ni->ni_buf, ni->ni_framelen);
freq = cie->ie_chan;
@@ -862,9 +862,9 @@ ar6k_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev,
return -EINVAL;
key->key_len = params->key_len;
- A_MEMCPY(key->key, params->key, key->key_len);
+ memcpy(key->key, params->key, key->key_len);
key->seq_len = params->seq_len;
- A_MEMCPY(key->seq, params->seq, key->seq_len);
+ memcpy(key->seq, params->seq, key->seq_len);
key->cipher = params->cipher;
}
@@ -1307,7 +1307,7 @@ ar6k_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
}
ar->arSsidLen = ibss_param->ssid_len;
- A_MEMCPY(ar->arSsid, ibss_param->ssid, ar->arSsidLen);
+ memcpy(ar->arSsid, ibss_param->ssid, ar->arSsidLen);
if(ibss_param->channel) {
ar->arChannelHint = ibss_param->channel->center_freq;
@@ -1322,7 +1322,7 @@ ar6k_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
A_MEMZERO(ar->arReqBssid, sizeof(ar->arReqBssid));
if(ibss_param->bssid) {
if(A_MEMCMP(&ibss_param->bssid, bcast_mac, AR6000_ETH_ADDR_LEN)) {
- A_MEMCPY(ar->arReqBssid, ibss_param->bssid, sizeof(ar->arReqBssid));
+ memcpy(ar->arReqBssid, ibss_param->bssid, sizeof(ar->arReqBssid));
}
}
diff --git a/drivers/staging/ath6kl/os/linux/hci_bridge.c b/drivers/staging/ath6kl/os/linux/hci_bridge.c
index f170382..db38bbf 100644
--- a/drivers/staging/ath6kl/os/linux/hci_bridge.c
+++ b/drivers/staging/ath6kl/os/linux/hci_bridge.c
@@ -226,7 +226,7 @@ static int ar6000_hci_transport_ready(HCI_TRANSPORT_HANDLE HCIHandle,
pHcidevInfo->pHCIDev = HCIHandle;
- A_MEMCPY(&pHcidevInfo->HCIProps,pProps,sizeof(*pProps));
+ memcpy(&pHcidevInfo->HCIProps,pProps,sizeof(*pProps));
AR_DEBUG_PRINTF(ATH_DEBUG_HCI_BRIDGE,("HCI ready (hci:0x%lX, headroom:%d, tailroom:%d blockpad:%d) \n",
(unsigned long)HCIHandle,
@@ -778,7 +778,7 @@ static int bt_send_frame(struct sk_buff *skb)
bt_cb(txSkb)->pkt_type = bt_cb(skb)->pkt_type;
txSkb->dev = (void *)pHcidevInfo->pBtStackHCIDev;
skb_reserve(txSkb, TX_PACKET_RSV_OFFSET + pHcidevInfo->HCIProps.HeadRoom);
- A_MEMCPY(txSkb->data, skb->data, skb->len);
+ memcpy(txSkb->data, skb->data, skb->len);
skb_put(txSkb,skb->len);
pPacket = AllocHTCStruct(pHcidevInfo);
diff --git a/drivers/staging/ath6kl/os/linux/include/osapi_linux.h b/drivers/staging/ath6kl/os/linux/include/osapi_linux.h
index 1957de0..cdb4195 100644
--- a/drivers/staging/ath6kl/os/linux/include/osapi_linux.h
+++ b/drivers/staging/ath6kl/os/linux/include/osapi_linux.h
@@ -76,7 +76,6 @@
#define A_CPU2BE16(x) htons(x)
#define A_CPU2BE32(x) htonl(x)
-#define A_MEMCPY(dst, src, len) memcpy((u8 *)(dst), (src), (len))
#define A_MEMZERO(addr, len) memset(addr, 0, len)
#define A_MEMCMP(addr1, addr2, len) memcmp((addr1), (addr2), (len))
#define A_MALLOC(size) kmalloc((size), GFP_KERNEL)
@@ -364,7 +363,6 @@ static inline void *A_ALIGN_TO_CACHE_LINE(void *ptr) {
#define PREPACK
#define POSTPACK __ATTRIB_PACK
-#define A_MEMCPY(dst, src, len) memcpy((dst), (src), (len))
#define A_MEMZERO(addr, len) memset((addr), 0, (len))
#define A_MEMCMP(addr1, addr2, len) memcmp((addr1), (addr2), (len))
#define A_MALLOC(size) malloc(size)
diff --git a/drivers/staging/ath6kl/os/linux/ioctl.c b/drivers/staging/ath6kl/os/linux/ioctl.c
index 4f30b25..9a7f920 100644
--- a/drivers/staging/ath6kl/os/linux/ioctl.c
+++ b/drivers/staging/ath6kl/os/linux/ioctl.c
@@ -281,7 +281,7 @@ ar6000_ioctl_set_country(struct net_device *dev, struct ifreq *rq)
ar->ap_profile_flag = 1; /* There is a change in profile */
ret = wmi_set_country(ar->arWmi, cmd.countryCode);
- A_MEMCPY(ar->ap_country_code, cmd.countryCode, 3);
+ memcpy(ar->ap_country_code, cmd.countryCode, 3);
switch (ret) {
case 0:
@@ -430,7 +430,7 @@ ar6000_ioctl_set_rssi_threshold(struct net_device *dev, struct ifreq *rq)
cmd.weight = rssiParams.weight;
cmd.pollTime = rssiParams.pollTime;
- A_MEMCPY(ar->rssi_map, &rssiParams.tholds, sizeof(ar->rssi_map));
+ memcpy(ar->rssi_map, &rssiParams.tholds, sizeof(ar->rssi_map));
/*
* only 6 elements, so use bubble sorting, in ascending order
*/
@@ -702,8 +702,8 @@ 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, sizeof(ar->tcmdRateCnt));
- A_MEMCPY(((A_UCHAR *)buf)+(4*sizeof(u32))+(TCMD_MAX_RATES *sizeof(u16)), ar->tcmdRateCntShortGuard, sizeof(ar->tcmdRateCntShortGuard));
+ memcpy(((A_UCHAR *)buf)+(4*sizeof(u32)), ar->tcmdRateCnt, sizeof(ar->tcmdRateCnt));
+ memcpy(((A_UCHAR *)buf)+(4*sizeof(u32))+(TCMD_MAX_RATES *sizeof(u16)), ar->tcmdRateCntShortGuard, sizeof(ar->tcmdRateCntShortGuard));
if (!ret && copy_to_user(rq->ifr_data, buf, sizeof(buf))) {
ret = -EFAULT;
@@ -732,8 +732,8 @@ ar6000_tcmd_rx_report_event(void *devt, u8 *results, int len)
ar->tcmdRxReport = 1;
A_MEMZERO(ar->tcmdRateCnt, sizeof(ar->tcmdRateCnt));
A_MEMZERO(ar->tcmdRateCntShortGuard, sizeof(ar->tcmdRateCntShortGuard));
- A_MEMCPY(ar->tcmdRateCnt, rx_rep->u.report.rateCnt, sizeof(ar->tcmdRateCnt));
- A_MEMCPY(ar->tcmdRateCntShortGuard, rx_rep->u.report.rateCntShortGuard, sizeof(ar->tcmdRateCntShortGuard));
+ memcpy(ar->tcmdRateCnt, rx_rep->u.report.rateCnt, sizeof(ar->tcmdRateCnt));
+ memcpy(ar->tcmdRateCntShortGuard, rx_rep->u.report.rateCntShortGuard, sizeof(ar->tcmdRateCntShortGuard));
wake_up(&arEvent);
}
@@ -1523,7 +1523,7 @@ ar6000_create_acl_data_osbuf(struct net_device *dev, u8 *userdata, void **p_osbu
/* Real copy to osbuf */
acl = (HCI_ACL_DATA_PKT *)(datap);
- A_MEMCPY(acl, tmp_space, hdr_size);
+ memcpy(acl, tmp_space, hdr_size);
if (a_copy_from_user(acl->data, userdata + hdr_size, acl->data_len)) {
ret = A_EFAULT;
break;
@@ -1770,7 +1770,7 @@ ar6000_ioctl_setkey(AR_SOFTC_T *ar, struct ieee80211req_key *ik)
(0 == memcmp(ik->ik_macaddr, bcast_mac, IEEE80211_ADDR_LEN)) ) {
keyUsage = GROUP_USAGE;
if(ar->arNextMode == AP_NETWORK) {
- A_MEMCPY(&ar->ap_mode_bkey, ik,
+ memcpy(&ar->ap_mode_bkey, ik,
sizeof(struct ieee80211req_key));
#ifdef WAPI_ENABLE
if(ar->arPairwiseCrypto == WAPI_CRYPT) {
@@ -1779,13 +1779,13 @@ ar6000_ioctl_setkey(AR_SOFTC_T *ar, struct ieee80211req_key *ik)
#endif
}
#ifdef USER_KEYS
- A_MEMCPY(&ar->user_saved_keys.bcast_ik, ik,
+ memcpy(&ar->user_saved_keys.bcast_ik, ik,
sizeof(struct ieee80211req_key));
#endif
} else {
keyUsage = PAIRWISE_USAGE;
#ifdef USER_KEYS
- A_MEMCPY(&ar->user_saved_keys.ucast_ik, ik,
+ memcpy(&ar->user_saved_keys.ucast_ik, ik,
sizeof(struct ieee80211req_key));
#endif
#ifdef WAPI_ENABLE
@@ -1827,7 +1827,7 @@ ar6000_ioctl_setkey(AR_SOFTC_T *ar, struct ieee80211req_key *ik)
A_MEMZERO(ar->arWepKeyList[index].arKey,
sizeof(ar->arWepKeyList[index].arKey));
- A_MEMCPY(ar->arWepKeyList[index].arKey, ik->ik_keydata, ik->ik_keylen);
+ memcpy(ar->arWepKeyList[index].arKey, ik->ik_keydata, ik->ik_keylen);
ar->arWepKeyList[index].arKeyLen = ik->ik_keylen;
if(ik->ik_flags & IEEE80211_KEY_DEFAULT){
@@ -3133,7 +3133,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
ret = -EFAULT;
} else {
- A_MEMCPY(ar->arReqBssid, adhocBssid.bssid, sizeof(ar->arReqBssid));
+ memcpy(ar->arReqBssid, adhocBssid.bssid, sizeof(ar->arReqBssid));
}
break;
}
@@ -4114,7 +4114,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
ap_get_sta_t temp;
A_MEMZERO(&temp, sizeof(temp));
for(i=0;i<AP_MAX_NUM_STA;i++) {
- A_MEMCPY(temp.sta[i].mac, ar->sta_list[i].mac, ATH_MAC_LEN);
+ memcpy(temp.sta[i].mac, ar->sta_list[i].mac, ATH_MAC_LEN);
temp.sta[i].aid = ar->sta_list[i].aid;
temp.sta[i].keymgmt = ar->sta_list[i].keymgmt;
temp.sta[i].ucipher = ar->sta_list[i].ucipher;
@@ -4526,7 +4526,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
case AR6000_XIOCTL_AP_GET_COUNTRY:
{
WMI_AP_SET_COUNTRY_CMD cty;
- A_MEMCPY(cty.countryCode, ar->ap_country_code, 3);
+ memcpy(cty.countryCode, ar->ap_country_code, 3);
if (ar->arWmiReady == false) {
ret = -EIO;
@@ -4743,7 +4743,7 @@ u8 acl_add_del_mac(WMI_AP_ACL *a, WMI_AP_ACL_MAC_CMD *acl)
if((already_avail >= 0) || (free_slot == -1))
return 0;
- A_MEMCPY(a->acl_mac[free_slot], acl->mac, ATH_MAC_LEN);
+ memcpy(a->acl_mac[free_slot], acl->mac, ATH_MAC_LEN);
a->index = a->index | (1 << free_slot);
acl->index = free_slot;
a->wildcard[free_slot] = acl->wildcard;
diff --git a/drivers/staging/ath6kl/os/linux/netbuf.c b/drivers/staging/ath6kl/os/linux/netbuf.c
index 0a41df0..63acedf 100644
--- a/drivers/staging/ath6kl/os/linux/netbuf.c
+++ b/drivers/staging/ath6kl/os/linux/netbuf.c
@@ -120,7 +120,7 @@ int
a_netbuf_push_data(void *bufPtr, char *srcPtr, s32 len)
{
skb_push((struct sk_buff *) bufPtr, len);
- A_MEMCPY(((struct sk_buff *)bufPtr)->data, srcPtr, len);
+ memcpy(((struct sk_buff *)bufPtr)->data, srcPtr, len);
return 0;
}
@@ -147,7 +147,7 @@ a_netbuf_put_data(void *bufPtr, char *srcPtr, s32 len)
char *start = (char*)(((struct sk_buff *)bufPtr)->data +
((struct sk_buff *)bufPtr)->len);
skb_put((struct sk_buff *)bufPtr, len);
- A_MEMCPY(start, srcPtr, len);
+ memcpy(start, srcPtr, len);
return 0;
}
@@ -184,7 +184,7 @@ a_netbuf_trim_data(void *bufPtr, char *dstPtr, s32 len)
char *start = (char*)(((struct sk_buff *)bufPtr)->data +
(((struct sk_buff *)bufPtr)->len - len));
- A_MEMCPY(dstPtr, start, len);
+ memcpy(dstPtr, start, len);
skb_trim((struct sk_buff *)bufPtr, ((struct sk_buff *)bufPtr)->len - len);
return 0;
@@ -217,7 +217,7 @@ a_netbuf_pull(void *bufPtr, s32 len)
int
a_netbuf_pull_data(void *bufPtr, char *dstPtr, s32 len)
{
- A_MEMCPY(dstPtr, ((struct sk_buff *)bufPtr)->data, len);
+ memcpy(dstPtr, ((struct sk_buff *)bufPtr)->data, len);
skb_pull((struct sk_buff *)bufPtr, len);
return 0;
diff --git a/drivers/staging/ath6kl/os/linux/wireless_ext.c b/drivers/staging/ath6kl/os/linux/wireless_ext.c
index baa8663..8262fde 100644
--- a/drivers/staging/ath6kl/os/linux/wireless_ext.c
+++ b/drivers/staging/ath6kl/os/linux/wireless_ext.c
@@ -112,7 +112,7 @@ ar6000_scan_node(void *arg, bss_t *ni)
A_MEMZERO(&iwe, sizeof(iwe));
iwe.cmd = SIOCGIWAP;
iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
- A_MEMCPY(iwe.u.ap_addr.sa_data, ni->ni_macaddr, 6);
+ memcpy(iwe.u.ap_addr.sa_data, ni->ni_macaddr, 6);
current_ev = IWE_STREAM_ADD_EVENT(param->info, current_ev, end_buf,
&iwe, IW_EV_ADDR_LEN);
}
@@ -506,7 +506,7 @@ ar6000_ioctl_siwessid(struct net_device *dev,
/* SSID change for AP network - Will take effect on commit */
if(A_MEMCMP(ar->arSsid,ssid,32) != 0) {
ar->arSsidLen = data->length - 1;
- A_MEMCPY(ar->arSsid, ssid, ar->arSsidLen);
+ memcpy(ar->arSsid, ssid, ar->arSsidLen);
ar->ap_profile_flag = 1; /* There is a change in profile */
}
return 0;
@@ -641,7 +641,7 @@ ar6000_ioctl_siwessid(struct net_device *dev,
}
ar->arSsidLen = data->length - 1;
- A_MEMCPY(ar->arSsid, ssid, ar->arSsidLen);
+ memcpy(ar->arSsid, ssid, ar->arSsidLen);
if (ar6000_connect_to_ap(ar)!= 0) {
up(&ar->arSem);
@@ -675,7 +675,7 @@ ar6000_ioctl_giwessid(struct net_device *dev,
data->flags = 1;
data->length = ar->arSsidLen;
- A_MEMCPY(essid, ar->arSsid, ar->arSsidLen);
+ memcpy(essid, ar->arSsid, ar->arSsidLen);
return 0;
}
@@ -1080,7 +1080,7 @@ ar6000_ioctl_siwencode(struct net_device *dev,
A_MEMZERO(ar->arWepKeyList[index].arKey,
sizeof(ar->arWepKeyList[index].arKey));
- A_MEMCPY(ar->arWepKeyList[index].arKey, keybuf, erq->length);
+ memcpy(ar->arWepKeyList[index].arKey, keybuf, erq->length);
ar->arWepKeyList[index].arKeyLen = erq->length;
ar->arDot11AuthMode = auth;
} else {
@@ -1158,14 +1158,14 @@ ar6000_ioctl_giwencode(struct net_device *dev,
erq->length = wk->arKeyLen;
}
if (wk->arKeyLen) {
- A_MEMCPY(key, wk->arKey, erq->length);
+ memcpy(key, wk->arKey, erq->length);
}
} else {
erq->flags &= ~IW_ENCODE_DISABLED;
if (ar->user_saved_keys.keyOk) {
erq->length = ar->user_saved_keys.ucast_ik.ik_keylen;
if (erq->length) {
- A_MEMCPY(key, ar->user_saved_keys.ucast_ik.ik_keydata, erq->length);
+ memcpy(key, ar->user_saved_keys.ucast_ik.ik_keydata, erq->length);
}
} else {
erq->length = 1; // not really printing any key but let iwconfig know enc is on
@@ -1616,7 +1616,7 @@ static int ar6000_set_wapi_key(struct net_device *dev,
}
keyData = (u8 *)(ext + 1);
keyLen = erq->length - sizeof(struct iw_encode_ext);
- A_MEMCPY(wapiKeyRsc, ext->tx_seq, sizeof(wapiKeyRsc));
+ memcpy(wapiKeyRsc, ext->tx_seq, sizeof(wapiKeyRsc));
if (A_MEMCMP(ext->addr.sa_data, broadcastMac, sizeof(broadcastMac)) == 0) {
keyUsage |= GROUP_USAGE;
@@ -1737,7 +1737,7 @@ ar6000_ioctl_siwencodeext(struct net_device *dev,
if (!ar->arConnected) {
A_MEMZERO(ar->arWepKeyList[index].arKey,
sizeof(ar->arWepKeyList[index].arKey));
- A_MEMCPY(ar->arWepKeyList[index].arKey, keyData, keyLen);
+ memcpy(ar->arWepKeyList[index].arKey, keyData, keyLen);
ar->arWepKeyList[index].arKeyLen = keyLen;
return 0;
@@ -1778,7 +1778,7 @@ ar6000_ioctl_siwencodeext(struct net_device *dev,
}
if (ext->ext_flags & IW_ENCODE_EXT_RX_SEQ_VALID) {
- A_MEMCPY(keyRsc, ext->rx_seq, sizeof(keyRsc));
+ memcpy(keyRsc, ext->rx_seq, sizeof(keyRsc));
} else {
A_MEMZERO(keyRsc, sizeof(keyRsc));
}
@@ -2318,7 +2318,7 @@ ar6000_ioctl_siwap(struct net_device *dev,
if (A_MEMCMP(&ap_addr->sa_data, bcast_mac, AR6000_ETH_ADDR_LEN) == 0) {
A_MEMZERO(ar->arReqBssid, sizeof(ar->arReqBssid));
} else {
- A_MEMCPY(ar->arReqBssid, &ap_addr->sa_data, sizeof(ar->arReqBssid));
+ memcpy(ar->arReqBssid, &ap_addr->sa_data, sizeof(ar->arReqBssid));
}
return 0;
@@ -2344,7 +2344,7 @@ ar6000_ioctl_giwap(struct net_device *dev,
}
if (ar->arNetworkType == AP_NETWORK) {
- A_MEMCPY(&ap_addr->sa_data, dev->dev_addr, ATH_MAC_LEN);
+ memcpy(&ap_addr->sa_data, dev->dev_addr, ATH_MAC_LEN);
ap_addr->sa_family = ARPHRD_ETHER;
return 0;
}
@@ -2353,7 +2353,7 @@ ar6000_ioctl_giwap(struct net_device *dev,
return -EINVAL;
}
- A_MEMCPY(&ap_addr->sa_data, ar->arBssid, sizeof(ar->arBssid));
+ memcpy(&ap_addr->sa_data, ar->arBssid, sizeof(ar->arBssid));
ap_addr->sa_family = ARPHRD_ETHER;
return 0;
diff --git a/drivers/staging/ath6kl/reorder/rcv_aggr.c b/drivers/staging/ath6kl/reorder/rcv_aggr.c
index 5cb4413..adb85eb 100644
--- a/drivers/staging/ath6kl/reorder/rcv_aggr.c
+++ b/drivers/staging/ath6kl/reorder/rcv_aggr.c
@@ -397,7 +397,7 @@ aggr_slice_amsdu(AGGR_INFO *p_aggr, RXTID *rxtid, void **osbuf)
break;
}
- A_MEMCPY(A_NETBUF_DATA(new_buf), framep, frame_8023_len);
+ memcpy(A_NETBUF_DATA(new_buf), framep, frame_8023_len);
A_NETBUF_PUT(new_buf, frame_8023_len);
if (wmi_dot3_2_dix(new_buf) != 0) {
A_PRINTF("dot3_2_dix err..\n");
diff --git a/drivers/staging/ath6kl/wlan/include/ieee80211.h b/drivers/staging/ath6kl/wlan/include/ieee80211.h
index 0b5441f..dfad19a 100644
--- a/drivers/staging/ath6kl/wlan/include/ieee80211.h
+++ b/drivers/staging/ath6kl/wlan/include/ieee80211.h
@@ -70,7 +70,7 @@
#define IEEE80211_ADDR_EQ(addr1, addr2) \
(A_MEMCMP(addr1, addr2, IEEE80211_ADDR_LEN) == 0)
-#define IEEE80211_ADDR_COPY(dst,src) A_MEMCPY(dst,src,IEEE80211_ADDR_LEN)
+#define IEEE80211_ADDR_COPY(dst,src) memcpy(dst,src,IEEE80211_ADDR_LEN)
#define IEEE80211_KEYBUF_SIZE 16
#define IEEE80211_MICBUF_SIZE (8+8) /* space for both tx and rx */
diff --git a/drivers/staging/ath6kl/wlan/src/wlan_node.c b/drivers/staging/ath6kl/wlan/src/wlan_node.c
index d61cb6e..c99a330 100644
--- a/drivers/staging/ath6kl/wlan/src/wlan_node.c
+++ b/drivers/staging/ath6kl/wlan/src/wlan_node.c
@@ -116,7 +116,7 @@ wlan_setup_node(struct ieee80211_node_table *nt, bss_t *ni,
int hash;
u32 timeoutValue = 0;
- A_MEMCPY(ni->ni_macaddr, macaddr, IEEE80211_ADDR_LEN);
+ memcpy(ni->ni_macaddr, macaddr, IEEE80211_ADDR_LEN);
hash = IEEE80211_NODE_HASH (macaddr);
ieee80211_node_initref (ni); /* mark referenced */
diff --git a/drivers/staging/ath6kl/wmi/wmi.c b/drivers/staging/ath6kl/wmi/wmi.c
index acbf6ed..bf9dd0b 100644
--- a/drivers/staging/ath6kl/wmi/wmi.c
+++ b/drivers/staging/ath6kl/wmi/wmi.c
@@ -422,8 +422,8 @@ wmi_dix_2_dot3(struct wmi_t *wmip, void *osbuf)
/*
* Save mac fields and length to be inserted later
*/
- A_MEMCPY(macHdr.dstMac, datap, ATH_MAC_LEN);
- A_MEMCPY(macHdr.srcMac, datap + ATH_MAC_LEN, ATH_MAC_LEN);
+ memcpy(macHdr.dstMac, datap, ATH_MAC_LEN);
+ memcpy(macHdr.srcMac, datap + ATH_MAC_LEN, ATH_MAC_LEN);
macHdr.typeOrLen = A_CPU2BE16(A_NETBUF_LEN(osbuf) - sizeof(ATH_MAC_HDR) +
sizeof(ATH_LLC_SNAP_HDR));
@@ -435,7 +435,7 @@ wmi_dix_2_dot3(struct wmi_t *wmip, void *osbuf)
}
datap = A_NETBUF_DATA(osbuf);
- A_MEMCPY(datap, &macHdr, sizeof (ATH_MAC_HDR));
+ memcpy(datap, &macHdr, sizeof (ATH_MAC_HDR));
llcHdr = (ATH_LLC_SNAP_HDR *)(datap + sizeof(ATH_MAC_HDR));
llcHdr->dsap = 0xAA;
@@ -484,7 +484,7 @@ int wmi_meta_add(struct wmi_t *wmip, void *osbuf, u8 *pVersion,void *pTxMetaS)
return A_NO_MEMORY;
}
pV2 = (WMI_TX_META_V2 *)A_NETBUF_DATA(osbuf);
- A_MEMCPY(pV2,(WMI_TX_META_V2 *)pTxMetaS,sizeof(WMI_TX_META_V2));
+ memcpy(pV2,(WMI_TX_META_V2 *)pTxMetaS,sizeof(WMI_TX_META_V2));
return (0);
}
#endif
@@ -654,8 +654,8 @@ wmi_dot11_hdr_add (struct wmi_t *wmip, void *osbuf, NETWORK_TYPE mode)
/*
* Save mac fields and length to be inserted later
*/
- A_MEMCPY(macHdr.dstMac, datap, ATH_MAC_LEN);
- A_MEMCPY(macHdr.srcMac, datap + ATH_MAC_LEN, ATH_MAC_LEN);
+ memcpy(macHdr.dstMac, datap, ATH_MAC_LEN);
+ memcpy(macHdr.srcMac, datap + ATH_MAC_LEN, ATH_MAC_LEN);
macHdr.typeOrLen = A_CPU2BE16(A_NETBUF_LEN(osbuf) - sizeof(ATH_MAC_HDR) +
sizeof(ATH_LLC_SNAP_HDR));
@@ -730,7 +730,7 @@ wmi_dot11_hdr_remove(struct wmi_t *wmip, void *osbuf)
type = pwh->i_fc[0] & IEEE80211_FC0_TYPE_MASK;
subtype = pwh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK;
- A_MEMCPY((u8 *)&wh, datap, sizeof(struct ieee80211_frame));
+ memcpy((u8 *)&wh, datap, sizeof(struct ieee80211_frame));
/* strip off the 802.11 hdr*/
if (subtype == IEEE80211_FC0_SUBTYPE_QOS) {
@@ -772,7 +772,7 @@ wmi_dot11_hdr_remove(struct wmi_t *wmip, void *osbuf)
A_NETBUF_PUSH(osbuf, sizeof(ATH_MAC_HDR));
datap = A_NETBUF_DATA(osbuf);
- A_MEMCPY (datap, &macHdr, sizeof(ATH_MAC_HDR));
+ memcpy (datap, &macHdr, sizeof(ATH_MAC_HDR));
return 0;
}
@@ -791,7 +791,7 @@ wmi_dot3_2_dix(void *osbuf)
A_ASSERT(osbuf != NULL);
datap = A_NETBUF_DATA(osbuf);
- A_MEMCPY(&macHdr, datap, sizeof(ATH_MAC_HDR));
+ memcpy(&macHdr, datap, sizeof(ATH_MAC_HDR));
llcHdr = (ATH_LLC_SNAP_HDR *)(datap + sizeof(ATH_MAC_HDR));
macHdr.typeOrLen = llcHdr->etherType;
@@ -801,7 +801,7 @@ wmi_dot3_2_dix(void *osbuf)
datap = A_NETBUF_DATA(osbuf);
- A_MEMCPY(datap, &macHdr, sizeof (ATH_MAC_HDR));
+ memcpy(datap, &macHdr, sizeof (ATH_MAC_HDR));
return (0);
}
@@ -999,7 +999,7 @@ wmi_control_rx(struct wmi_t *wmip, void *osbuf)
*/
WMI_BSS_INFO_HDR2 bih2;
WMI_BSS_INFO_HDR *bih;
- A_MEMCPY(&bih2, datap, sizeof(WMI_BSS_INFO_HDR2));
+ memcpy(&bih2, datap, sizeof(WMI_BSS_INFO_HDR2));
A_NETBUF_PUSH(osbuf, 4);
datap = A_NETBUF_DATA(osbuf);
@@ -1011,7 +1011,7 @@ wmi_control_rx(struct wmi_t *wmip, void *osbuf)
bih->snr = bih2.snr;
bih->rssi = bih2.snr - 95;
bih->ieMask = bih2.ieMask;
- A_MEMCPY(bih->bssid, bih2.bssid, ATH_MAC_LEN);
+ memcpy(bih->bssid, bih2.bssid, ATH_MAC_LEN);
status = wmi_bssInfo_event_rx(wmip, datap, len);
A_WMI_SEND_GENERIC_EVENT_TO_APP(wmip->wmi_devt, id, datap, len);
@@ -1275,7 +1275,7 @@ wmi_connect_event_rx(struct wmi_t *wmip, u8 *datap, int len)
ev->bssid[0], ev->bssid[1], ev->bssid[2],
ev->bssid[3], ev->bssid[4], ev->bssid[5]));
- A_MEMCPY(wmip->wmi_bssid, ev->bssid, ATH_MAC_LEN);
+ memcpy(wmip->wmi_bssid, ev->bssid, ATH_MAC_LEN);
/* initialize pointer to start of assoc rsp IEs */
pie = ev->assocInfo + ev->beaconIeLen + ev->assocReqLen +
@@ -1538,7 +1538,7 @@ wmi_bssInfo_event_rx(struct wmi_t *wmip, u8 *datap, int len)
/* copy the first 14 bytes such as
* time-stamp(8), beacon-interval(2), cap-info(2), ssid-id(1), ssid-len(1). */
- A_MEMCPY(ni_buf, buf, SSID_IE_LEN_INDEX + 1);
+ memcpy(ni_buf, buf, SSID_IE_LEN_INDEX + 1);
ni_buf[SSID_IE_LEN_INDEX] = cached_ssid_len;
ni_buf += (SSID_IE_LEN_INDEX + 1);
@@ -1547,7 +1547,7 @@ wmi_bssInfo_event_rx(struct wmi_t *wmip, u8 *datap, int len)
buf_len -= (SSID_IE_LEN_INDEX + 1);
/* copy the cached ssid */
- A_MEMCPY(ni_buf, cached_ssid_buf, cached_ssid_len);
+ memcpy(ni_buf, cached_ssid_buf, cached_ssid_len);
ni_buf += cached_ssid_len;
buf += beacon_ssid_len;
@@ -1557,10 +1557,10 @@ wmi_bssInfo_event_rx(struct wmi_t *wmip, u8 *datap, int len)
buf_len -= (cached_ssid_len - beacon_ssid_len);
/* now copy the rest of bytes */
- A_MEMCPY(ni_buf, buf, buf_len);
+ memcpy(ni_buf, buf, buf_len);
}
else
- A_MEMCPY(bss->ni_buf, buf, len);
+ memcpy(bss->ni_buf, buf, len);
bss->ni_framelen = len;
if (wlan_parse_beacon(bss->ni_buf, len, &bss->ni_cie) != 0) {
@@ -1614,7 +1614,7 @@ wmi_opt_frame_event_rx(struct wmi_t *wmip, u8 *datap, int len)
bss->ni_snr = bih->snr;
bss->ni_cie.ie_chan = bih->channel;
A_ASSERT(bss->ni_buf != NULL);
- A_MEMCPY(bss->ni_buf, buf, len);
+ memcpy(bss->ni_buf, buf, len);
wlan_setup_node(&wmip->wmi_scan_table, bss, bih->bssid);
return 0;
@@ -2446,7 +2446,7 @@ wmi_connect_cmd(struct wmi_t *wmip, NETWORK_TYPE netType,
if (ssidLength)
{
- A_MEMCPY(cc->ssid, ssid, ssidLength);
+ memcpy(cc->ssid, ssid, ssidLength);
}
cc->ssidLength = ssidLength;
@@ -2461,7 +2461,7 @@ wmi_connect_cmd(struct wmi_t *wmip, NETWORK_TYPE netType,
cc->ctrl_flags = ctrl_flags;
if (bssid != NULL) {
- A_MEMCPY(cc->bssid, bssid, ATH_MAC_LEN);
+ memcpy(cc->bssid, bssid, ATH_MAC_LEN);
}
wmip->wmi_pair_crypto_type = pairwiseCrypto;
@@ -2490,7 +2490,7 @@ wmi_reconnect_cmd(struct wmi_t *wmip, u8 *bssid, u16 channel)
cc->channel = channel;
if (bssid != NULL) {
- A_MEMCPY(cc->bssid, bssid, ATH_MAC_LEN);
+ memcpy(cc->bssid, bssid, ATH_MAC_LEN);
}
return (wmi_cmd_send(wmip, osbuf, WMI_RECONNECT_CMDID, NO_SYNC_WMIFLAG));
@@ -2547,7 +2547,7 @@ wmi_startscan_cmd(struct wmi_t *wmip, WMI_SCAN_TYPE scanType,
sc->forceScanInterval = forceScanInterval;
sc->numChannels = numChan;
if (numChan) {
- A_MEMCPY(sc->channelList, channelList, numChan * sizeof(u16));
+ memcpy(sc->channelList, channelList, numChan * sizeof(u16));
}
return (wmi_cmd_send(wmip, osbuf, WMI_START_SCAN_CMDID, NO_SYNC_WMIFLAG));
@@ -2650,7 +2650,7 @@ wmi_probedSsid_cmd(struct wmi_t *wmip, u8 index, u8 flag,
cmd->entryIndex = index;
cmd->flag = flag;
cmd->ssidLength = ssidLength;
- A_MEMCPY(cmd->ssid, ssid, ssidLength);
+ memcpy(cmd->ssid, ssid, ssidLength);
return (wmi_cmd_send(wmip, osbuf, WMI_SET_PROBED_SSID_CMDID,
NO_SYNC_WMIFLAG));
@@ -2720,7 +2720,7 @@ wmi_associnfo_cmd(struct wmi_t *wmip, u8 ieType,
A_MEMZERO(cmd, cmdLen);
cmd->ieType = ieType;
cmd->bufferSize = ieLen;
- A_MEMCPY(cmd->assocInfo, ieInfo, ieLen);
+ memcpy(cmd->assocInfo, ieInfo, ieLen);
return (wmi_cmd_send(wmip, osbuf, WMI_SET_ASSOC_INFO_CMDID,
NO_SYNC_WMIFLAG));
@@ -2880,18 +2880,18 @@ wmi_addKey_cmd(struct wmi_t *wmip, u8 keyIndex, CRYPTO_TYPE keyType,
cmd->keyType = keyType;
cmd->keyUsage = keyUsage;
cmd->keyLength = keyLength;
- A_MEMCPY(cmd->key, keyMaterial, keyLength);
+ memcpy(cmd->key, keyMaterial, keyLength);
#ifdef WAPI_ENABLE
if (NULL != keyRSC && key_op_ctrl != KEY_OP_INIT_WAPIPN) {
#else
if (NULL != keyRSC) {
#endif // WAPI_ENABLE
- A_MEMCPY(cmd->keyRSC, keyRSC, sizeof(cmd->keyRSC));
+ memcpy(cmd->keyRSC, keyRSC, sizeof(cmd->keyRSC));
}
cmd->key_op_ctrl = key_op_ctrl;
if(macAddr) {
- A_MEMCPY(cmd->key_macaddr,macAddr,IEEE80211_ADDR_LEN);
+ memcpy(cmd->key_macaddr,macAddr,IEEE80211_ADDR_LEN);
}
return (wmi_cmd_send(wmip, osbuf, WMI_ADD_CIPHER_KEY_CMDID, sync_flag));
@@ -2912,7 +2912,7 @@ wmi_add_krk_cmd(struct wmi_t *wmip, u8 *krk)
cmd = (WMI_ADD_KRK_CMD *)(A_NETBUF_DATA(osbuf));
A_MEMZERO(cmd, sizeof(*cmd));
- A_MEMCPY(cmd->krk, krk, WMI_KRK_LEN);
+ memcpy(cmd->krk, krk, WMI_KRK_LEN);
return (wmi_cmd_send(wmip, osbuf, WMI_ADD_KRK_CMDID, NO_SYNC_WMIFLAG));
}
@@ -2971,9 +2971,9 @@ wmi_setPmkid_cmd(struct wmi_t *wmip, u8 *bssid, u8 *pmkId,
A_NETBUF_PUT(osbuf, sizeof(*cmd));
cmd = (WMI_SET_PMKID_CMD *)(A_NETBUF_DATA(osbuf));
- A_MEMCPY(cmd->bssid, bssid, sizeof(cmd->bssid));
+ memcpy(cmd->bssid, bssid, sizeof(cmd->bssid));
if (set == true) {
- A_MEMCPY(cmd->pmkid, pmkId, sizeof(cmd->pmkid));
+ memcpy(cmd->pmkid, pmkId, sizeof(cmd->pmkid));
cmd->enable = PMKID_ENABLE;
} else {
A_MEMZERO(cmd->pmkid, sizeof(cmd->pmkid));
@@ -3045,7 +3045,7 @@ wmi_set_pmkid_list_cmd(struct wmi_t *wmip,
cmd->numPMKID = pmkInfo->numPMKID;
for (i = 0; i < cmd->numPMKID; i++) {
- A_MEMCPY(&cmd->pmkidList[i], &pmkInfo->pmkidList[i],
+ memcpy(&cmd->pmkidList[i], &pmkInfo->pmkidList[i],
WMI_PMKID_LEN);
}
@@ -3258,7 +3258,7 @@ wmi_create_pstream_cmd(struct wmi_t *wmip, WMI_CREATE_PSTREAM_CMD *params)
cmd = (WMI_CREATE_PSTREAM_CMD *)(A_NETBUF_DATA(osbuf));
A_MEMZERO(cmd, sizeof(*cmd));
- A_MEMCPY(cmd, params, sizeof(*cmd));
+ memcpy(cmd, params, sizeof(*cmd));
/* this is an implicitly created Fat pipe */
if ((u32)params->tsid == (u32)WMI_IMPLICIT_PSTREAM) {
@@ -3625,7 +3625,7 @@ wmi_set_channelParams_cmd(struct wmi_t *wmip, u8 scanParam,
cmd->scanParam = scanParam;
cmd->phyMode = mode;
cmd->numChannels = numChan;
- A_MEMCPY(cmd->channelList, channelList, numChan * sizeof(u16));
+ memcpy(cmd->channelList, channelList, numChan * sizeof(u16));
return (wmi_cmd_send(wmip, osbuf, WMI_SET_CHANNEL_PARAMS_CMDID,
NO_SYNC_WMIFLAG));
@@ -3724,7 +3724,7 @@ wmi_set_ip_cmd(struct wmi_t *wmip, WMI_SET_IP_CMD *ipCmd)
A_NETBUF_PUT(osbuf, sizeof(WMI_SET_IP_CMD));
cmd = (WMI_SET_IP_CMD *)(A_NETBUF_DATA(osbuf));
- A_MEMCPY(cmd, ipCmd, sizeof(WMI_SET_IP_CMD));
+ memcpy(cmd, ipCmd, sizeof(WMI_SET_IP_CMD));
return (wmi_cmd_send(wmip, osbuf, WMI_SET_IP_CMDID,
NO_SYNC_WMIFLAG));
@@ -3756,7 +3756,7 @@ wmi_set_host_sleep_mode_cmd(struct wmi_t *wmip,
cmd = (WMI_SET_HOST_SLEEP_MODE_CMD *)(A_NETBUF_DATA(osbuf));
A_MEMZERO(cmd, size);
- A_MEMCPY(cmd, hostModeCmd, sizeof(WMI_SET_HOST_SLEEP_MODE_CMD));
+ memcpy(cmd, hostModeCmd, sizeof(WMI_SET_HOST_SLEEP_MODE_CMD));
if(hostModeCmd->asleep) {
/*
@@ -3811,7 +3811,7 @@ wmi_set_wow_mode_cmd(struct wmi_t *wmip,
cmd = (WMI_SET_WOW_MODE_CMD *)(A_NETBUF_DATA(osbuf));
A_MEMZERO(cmd, size);
- A_MEMCPY(cmd, wowModeCmd, sizeof(WMI_SET_WOW_MODE_CMD));
+ memcpy(cmd, wowModeCmd, sizeof(WMI_SET_WOW_MODE_CMD));
return (wmi_cmd_send(wmip, osbuf, WMI_SET_WOW_MODE_CMDID,
NO_SYNC_WMIFLAG));
@@ -3837,7 +3837,7 @@ wmi_get_wow_list_cmd(struct wmi_t *wmip,
cmd = (WMI_GET_WOW_LIST_CMD *)(A_NETBUF_DATA(osbuf));
A_MEMZERO(cmd, size);
- A_MEMCPY(cmd, wowListCmd, sizeof(WMI_GET_WOW_LIST_CMD));
+ memcpy(cmd, wowListCmd, sizeof(WMI_GET_WOW_LIST_CMD));
return (wmi_cmd_send(wmip, osbuf, WMI_GET_WOW_LIST_CMDID,
NO_SYNC_WMIFLAG));
@@ -3885,10 +3885,10 @@ int wmi_add_wow_pattern_cmd(struct wmi_t *wmip,
cmd->filter_offset = addWowCmd->filter_offset;
cmd->filter_size = addWowCmd->filter_size;
- A_MEMCPY(cmd->filter, pattern, addWowCmd->filter_size);
+ memcpy(cmd->filter, pattern, addWowCmd->filter_size);
filter_mask = (u8 *)(cmd->filter + cmd->filter_size);
- A_MEMCPY(filter_mask, mask, addWowCmd->filter_size);
+ memcpy(filter_mask, mask, addWowCmd->filter_size);
return (wmi_cmd_send(wmip, osbuf, WMI_ADD_WOW_PATTERN_CMDID,
@@ -3914,7 +3914,7 @@ wmi_del_wow_pattern_cmd(struct wmi_t *wmip,
cmd = (WMI_DEL_WOW_PATTERN_CMD *)(A_NETBUF_DATA(osbuf));
A_MEMZERO(cmd, size);
- A_MEMCPY(cmd, delWowCmd, sizeof(WMI_DEL_WOW_PATTERN_CMD));
+ memcpy(cmd, delWowCmd, sizeof(WMI_DEL_WOW_PATTERN_CMD));
return (wmi_cmd_send(wmip, osbuf, WMI_DEL_WOW_PATTERN_CMDID,
NO_SYNC_WMIFLAG));
@@ -4026,7 +4026,7 @@ wmi_set_lq_threshold_params(struct wmi_t *wmip,
cmd = (WMI_LQ_THRESHOLD_PARAMS_CMD *)(A_NETBUF_DATA(osbuf));
A_MEMZERO(cmd, size);
- A_MEMCPY(cmd, lqCmd, sizeof(WMI_LQ_THRESHOLD_PARAMS_CMD));
+ memcpy(cmd, lqCmd, sizeof(WMI_LQ_THRESHOLD_PARAMS_CMD));
return (wmi_cmd_send(wmip, osbuf, WMI_LQ_THRESHOLD_PARAMS_CMDID,
NO_SYNC_WMIFLAG));
@@ -4129,7 +4129,7 @@ wmi_addBadAp_cmd(struct wmi_t *wmip, u8 apIndex, u8 *bssid)
cmd = (WMI_ADD_BAD_AP_CMD *)(A_NETBUF_DATA(osbuf));
cmd->badApIndex = apIndex;
- A_MEMCPY(cmd->bssid, bssid, sizeof(cmd->bssid));
+ memcpy(cmd->bssid, bssid, sizeof(cmd->bssid));
return (wmi_cmd_send(wmip, osbuf, WMI_ADD_BAD_AP_CMDID, SYNC_BEFORE_WMIFLAG));
}
@@ -4244,7 +4244,7 @@ wmi_set_roam_ctrl_cmd(struct wmi_t *wmip, WMI_SET_ROAM_CTRL_CMD *p,
cmd = (WMI_SET_ROAM_CTRL_CMD *)(A_NETBUF_DATA(osbuf));
A_MEMZERO(cmd, size);
- A_MEMCPY(cmd, p, size);
+ memcpy(cmd, p, size);
return (wmi_cmd_send(wmip, osbuf, WMI_SET_ROAM_CTRL_CMDID,
NO_SYNC_WMIFLAG));
@@ -4276,7 +4276,7 @@ wmi_set_powersave_timers_cmd(struct wmi_t *wmip,
cmd = (WMI_POWERSAVE_TIMERS_POLICY_CMD *)(A_NETBUF_DATA(osbuf));
A_MEMZERO(cmd, size);
- A_MEMCPY(cmd, pCmd, size);
+ memcpy(cmd, pCmd, size);
return (wmi_cmd_send(wmip, osbuf, WMI_SET_POWERSAVE_TIMERS_POLICY_CMDID,
NO_SYNC_WMIFLAG));
@@ -4482,7 +4482,7 @@ void
wmi_get_current_bssid(struct wmi_t *wmip, u8 *bssid)
{
if (bssid != NULL) {
- A_MEMCPY(bssid, wmip->wmi_bssid, ATH_MAC_LEN);
+ memcpy(bssid, wmip->wmi_bssid, ATH_MAC_LEN);
}
}
@@ -4530,9 +4530,9 @@ wmi_opt_tx_frame_cmd(struct wmi_t *wmip,
cmd->frmType = frmType;
cmd->optIEDataLen = optIEDataLen;
//cmd->optIEData = (u8 *)((int)cmd + sizeof(*cmd));
- A_MEMCPY(cmd->bssid, bssid, sizeof(cmd->bssid));
- A_MEMCPY(cmd->dstAddr, dstMacAddr, sizeof(cmd->dstAddr));
- A_MEMCPY(&cmd->optIEData[0], optIEData, optIEDataLen);
+ memcpy(cmd->bssid, bssid, sizeof(cmd->bssid));
+ memcpy(cmd->dstAddr, dstMacAddr, sizeof(cmd->dstAddr));
+ memcpy(&cmd->optIEData[0], optIEData, optIEDataLen);
return (wmi_cmd_send(wmip, osbuf, WMI_OPT_TX_FRAME_CMDID,
NO_SYNC_WMIFLAG));
@@ -4858,7 +4858,7 @@ wmi_set_country(struct wmi_t *wmip, A_UCHAR *countryCode)
cmd = (WMI_AP_SET_COUNTRY_CMD *)(A_NETBUF_DATA(osbuf));
A_MEMZERO(cmd, sizeof(*cmd));
- A_MEMCPY(cmd->countryCode,countryCode,3);
+ memcpy(cmd->countryCode,countryCode,3);
return (wmi_cmd_send(wmip, osbuf, WMI_AP_SET_COUNTRY_CMDID,
NO_SYNC_WMIFLAG));
@@ -4884,7 +4884,7 @@ wmi_test_cmd(struct wmi_t *wmip, u8 *buf, u32 len)
}
A_NETBUF_PUT(osbuf, len);
data = A_NETBUF_DATA(osbuf);
- A_MEMCPY(data, buf, len);
+ memcpy(data, buf, len);
return(wmi_cmd_send(wmip, osbuf, WMI_TEST_CMDID,
NO_SYNC_WMIFLAG));
@@ -4972,7 +4972,7 @@ wmi_set_bt_params_cmd(struct wmi_t *wmip, WMI_SET_BT_PARAMS_CMD* cmd)
alloc_cmd = (WMI_SET_BT_PARAMS_CMD *)(A_NETBUF_DATA(osbuf));
A_MEMZERO(alloc_cmd, sizeof(*cmd));
- A_MEMCPY(alloc_cmd, cmd, sizeof(*cmd));
+ memcpy(alloc_cmd, cmd, sizeof(*cmd));
return (wmi_cmd_send(wmip, osbuf, WMI_SET_BT_PARAMS_CMDID,
NO_SYNC_WMIFLAG));
@@ -4991,7 +4991,7 @@ wmi_set_btcoex_fe_ant_cmd(struct wmi_t *wmip, WMI_SET_BTCOEX_FE_ANT_CMD * cmd)
A_NETBUF_PUT(osbuf, sizeof(*cmd));
alloc_cmd = (WMI_SET_BTCOEX_FE_ANT_CMD *)(A_NETBUF_DATA(osbuf));
A_MEMZERO(alloc_cmd, sizeof(*cmd));
- A_MEMCPY(alloc_cmd,cmd,sizeof(WMI_SET_BTCOEX_FE_ANT_CMD));
+ memcpy(alloc_cmd,cmd,sizeof(WMI_SET_BTCOEX_FE_ANT_CMD));
return (wmi_cmd_send(wmip, osbuf, WMI_SET_BTCOEX_FE_ANT_CMDID,
NO_SYNC_WMIFLAG));
@@ -5012,7 +5012,7 @@ wmi_set_btcoex_colocated_bt_dev_cmd(struct wmi_t *wmip,
A_NETBUF_PUT(osbuf, sizeof(*cmd));
alloc_cmd = (WMI_SET_BTCOEX_COLOCATED_BT_DEV_CMD *)(A_NETBUF_DATA(osbuf));
A_MEMZERO(alloc_cmd, sizeof(*cmd));
- A_MEMCPY(alloc_cmd,cmd,sizeof(WMI_SET_BTCOEX_COLOCATED_BT_DEV_CMD));
+ memcpy(alloc_cmd,cmd,sizeof(WMI_SET_BTCOEX_COLOCATED_BT_DEV_CMD));
A_PRINTF("colocated bt = %d\n", alloc_cmd->btcoexCoLocatedBTdev);
return (wmi_cmd_send(wmip, osbuf, WMI_SET_BTCOEX_COLOCATED_BT_DEV_CMDID,
NO_SYNC_WMIFLAG));
@@ -5033,7 +5033,7 @@ wmi_set_btcoex_btinquiry_page_config_cmd(struct wmi_t *wmip,
A_NETBUF_PUT(osbuf, sizeof(*cmd));
alloc_cmd = (WMI_SET_BTCOEX_BTINQUIRY_PAGE_CONFIG_CMD *)(A_NETBUF_DATA(osbuf));
A_MEMZERO(alloc_cmd, sizeof(*cmd));
- A_MEMCPY(alloc_cmd,cmd,sizeof(WMI_SET_BTCOEX_BTINQUIRY_PAGE_CONFIG_CMD));
+ memcpy(alloc_cmd,cmd,sizeof(WMI_SET_BTCOEX_BTINQUIRY_PAGE_CONFIG_CMD));
return (wmi_cmd_send(wmip, osbuf, WMI_SET_BTCOEX_BTINQUIRY_PAGE_CONFIG_CMDID,
NO_SYNC_WMIFLAG));
@@ -5053,7 +5053,7 @@ wmi_set_btcoex_sco_config_cmd(struct wmi_t *wmip,
A_NETBUF_PUT(osbuf, sizeof(*cmd));
alloc_cmd = (WMI_SET_BTCOEX_SCO_CONFIG_CMD *)(A_NETBUF_DATA(osbuf));
A_MEMZERO(alloc_cmd, sizeof(*cmd));
- A_MEMCPY(alloc_cmd,cmd,sizeof(WMI_SET_BTCOEX_SCO_CONFIG_CMD));
+ memcpy(alloc_cmd,cmd,sizeof(WMI_SET_BTCOEX_SCO_CONFIG_CMD));
return (wmi_cmd_send(wmip, osbuf, WMI_SET_BTCOEX_SCO_CONFIG_CMDID ,
NO_SYNC_WMIFLAG));
@@ -5073,7 +5073,7 @@ wmi_set_btcoex_a2dp_config_cmd(struct wmi_t *wmip,
A_NETBUF_PUT(osbuf, sizeof(*cmd));
alloc_cmd = (WMI_SET_BTCOEX_A2DP_CONFIG_CMD *)(A_NETBUF_DATA(osbuf));
A_MEMZERO(alloc_cmd, sizeof(*cmd));
- A_MEMCPY(alloc_cmd,cmd,sizeof(WMI_SET_BTCOEX_A2DP_CONFIG_CMD));
+ memcpy(alloc_cmd,cmd,sizeof(WMI_SET_BTCOEX_A2DP_CONFIG_CMD));
return (wmi_cmd_send(wmip, osbuf, WMI_SET_BTCOEX_A2DP_CONFIG_CMDID ,
NO_SYNC_WMIFLAG));
@@ -5093,7 +5093,7 @@ wmi_set_btcoex_aclcoex_config_cmd(struct wmi_t *wmip,
A_NETBUF_PUT(osbuf, sizeof(*cmd));
alloc_cmd = (WMI_SET_BTCOEX_ACLCOEX_CONFIG_CMD *)(A_NETBUF_DATA(osbuf));
A_MEMZERO(alloc_cmd, sizeof(*cmd));
- A_MEMCPY(alloc_cmd,cmd,sizeof(WMI_SET_BTCOEX_ACLCOEX_CONFIG_CMD));
+ memcpy(alloc_cmd,cmd,sizeof(WMI_SET_BTCOEX_ACLCOEX_CONFIG_CMD));
return (wmi_cmd_send(wmip, osbuf, WMI_SET_BTCOEX_ACLCOEX_CONFIG_CMDID ,
NO_SYNC_WMIFLAG));
@@ -5112,7 +5112,7 @@ wmi_set_btcoex_debug_cmd(struct wmi_t *wmip, WMI_SET_BTCOEX_DEBUG_CMD * cmd)
A_NETBUF_PUT(osbuf, sizeof(*cmd));
alloc_cmd = (WMI_SET_BTCOEX_DEBUG_CMD *)(A_NETBUF_DATA(osbuf));
A_MEMZERO(alloc_cmd, sizeof(*cmd));
- A_MEMCPY(alloc_cmd,cmd,sizeof(WMI_SET_BTCOEX_DEBUG_CMD));
+ memcpy(alloc_cmd,cmd,sizeof(WMI_SET_BTCOEX_DEBUG_CMD));
return (wmi_cmd_send(wmip, osbuf, WMI_SET_BTCOEX_DEBUG_CMDID ,
NO_SYNC_WMIFLAG));
@@ -5132,7 +5132,7 @@ wmi_set_btcoex_bt_operating_status_cmd(struct wmi_t * wmip,
A_NETBUF_PUT(osbuf, sizeof(*cmd));
alloc_cmd = (WMI_SET_BTCOEX_BT_OPERATING_STATUS_CMD *)(A_NETBUF_DATA(osbuf));
A_MEMZERO(alloc_cmd, sizeof(*cmd));
- A_MEMCPY(alloc_cmd,cmd,sizeof(WMI_SET_BTCOEX_BT_OPERATING_STATUS_CMD));
+ memcpy(alloc_cmd,cmd,sizeof(WMI_SET_BTCOEX_BT_OPERATING_STATUS_CMD));
return (wmi_cmd_send(wmip, osbuf, WMI_SET_BTCOEX_BT_OPERATING_STATUS_CMDID ,
NO_SYNC_WMIFLAG));
@@ -5151,7 +5151,7 @@ wmi_get_btcoex_config_cmd(struct wmi_t * wmip, WMI_GET_BTCOEX_CONFIG_CMD * cmd)
A_NETBUF_PUT(osbuf, sizeof(*cmd));
alloc_cmd = (WMI_GET_BTCOEX_CONFIG_CMD *)(A_NETBUF_DATA(osbuf));
A_MEMZERO(alloc_cmd, sizeof(*cmd));
- A_MEMCPY(alloc_cmd,cmd,sizeof(WMI_GET_BTCOEX_CONFIG_CMD));
+ memcpy(alloc_cmd,cmd,sizeof(WMI_GET_BTCOEX_CONFIG_CMD));
return (wmi_cmd_send(wmip, osbuf, WMI_GET_BTCOEX_CONFIG_CMDID ,
NO_SYNC_WMIFLAG));
@@ -5225,7 +5225,7 @@ wmi_set_params_cmd(struct wmi_t *wmip, u32 opcode, u32 length, char *buffer)
A_MEMZERO(cmd, sizeof(*cmd));
cmd->opcode = opcode;
cmd->length = length;
- A_MEMCPY(cmd->buffer, buffer, length);
+ memcpy(cmd->buffer, buffer, length);
return (wmi_cmd_send(wmip, osbuf, WMI_SET_PARAMS_CMDID,
NO_SYNC_WMIFLAG));
@@ -5324,7 +5324,7 @@ wmi_set_appie_cmd(struct wmi_t *wmip, u8 mgmtFrmType, u8 ieLen,
cmd->mgmtFrmType = mgmtFrmType;
cmd->ieLen = ieLen;
- A_MEMCPY(cmd->ieInfo, ieInfo, ieLen);
+ memcpy(cmd->ieInfo, ieInfo, ieLen);
return (wmi_cmd_send(wmip, osbuf, WMI_SET_APPIE_CMDID, NO_SYNC_WMIFLAG));
}
@@ -5344,7 +5344,7 @@ wmi_set_halparam_cmd(struct wmi_t *wmip, u8 *cmd, u16 dataLen)
data = A_NETBUF_DATA(osbuf);
- A_MEMCPY(data, cmd, dataLen);
+ memcpy(data, cmd, dataLen);
return (wmi_cmd_send(wmip, osbuf, WMI_SET_WHALPARAM_CMDID, NO_SYNC_WMIFLAG));
}
@@ -5933,7 +5933,7 @@ wmi_send_rssi_threshold_params(struct wmi_t *wmip,
cmd = (WMI_RSSI_THRESHOLD_PARAMS_CMD *)(A_NETBUF_DATA(osbuf));
A_MEMZERO(cmd, size);
- A_MEMCPY(cmd, rssiCmd, sizeof(WMI_RSSI_THRESHOLD_PARAMS_CMD));
+ memcpy(cmd, rssiCmd, sizeof(WMI_RSSI_THRESHOLD_PARAMS_CMD));
return (wmi_cmd_send(wmip, osbuf, WMI_RSSI_THRESHOLD_PARAMS_CMDID,
NO_SYNC_WMIFLAG));
@@ -5956,7 +5956,7 @@ wmi_send_snr_threshold_params(struct wmi_t *wmip,
A_NETBUF_PUT(osbuf, size);
cmd = (WMI_SNR_THRESHOLD_PARAMS_CMD *)(A_NETBUF_DATA(osbuf));
A_MEMZERO(cmd, size);
- A_MEMCPY(cmd, snrCmd, sizeof(WMI_SNR_THRESHOLD_PARAMS_CMD));
+ memcpy(cmd, snrCmd, sizeof(WMI_SNR_THRESHOLD_PARAMS_CMD));
return (wmi_cmd_send(wmip, osbuf, WMI_SNR_THRESHOLD_PARAMS_CMDID,
NO_SYNC_WMIFLAG));
@@ -5977,7 +5977,7 @@ wmi_set_target_event_report_cmd(struct wmi_t *wmip, WMI_SET_TARGET_EVENT_REPORT_
alloc_cmd = (WMI_SET_TARGET_EVENT_REPORT_CMD *)(A_NETBUF_DATA(osbuf));
A_MEMZERO(alloc_cmd, sizeof(*cmd));
- A_MEMCPY(alloc_cmd, cmd, sizeof(*cmd));
+ memcpy(alloc_cmd, cmd, sizeof(*cmd));
return (wmi_cmd_send(wmip, osbuf, WMI_SET_TARGET_EVENT_REPORT_CMDID,
NO_SYNC_WMIFLAG));
@@ -6089,7 +6089,7 @@ wmi_ap_profile_commit(struct wmi_t *wmip, WMI_CONNECT_CMD *p)
cm = (WMI_CONNECT_CMD *)(A_NETBUF_DATA(osbuf));
A_MEMZERO(cm, sizeof(*cm));
- A_MEMCPY(cm,p,sizeof(*cm));
+ memcpy(cm,p,sizeof(*cm));
return (wmi_cmd_send(wmip, osbuf, WMI_AP_CONFIG_COMMIT_CMDID, NO_SYNC_WMIFLAG));
}
@@ -6171,7 +6171,7 @@ wmi_ap_acl_mac_list(struct wmi_t *wmip, WMI_AP_ACL_MAC_CMD *acl)
A_NETBUF_PUT(osbuf, sizeof(WMI_AP_ACL_MAC_CMD));
a = (WMI_AP_ACL_MAC_CMD *)(A_NETBUF_DATA(osbuf));
A_MEMZERO(a, sizeof(*a));
- A_MEMCPY(a,acl,sizeof(*acl));
+ memcpy(a,acl,sizeof(*acl));
return (wmi_cmd_send(wmip, osbuf, WMI_AP_ACL_MAC_LIST_CMDID, NO_SYNC_WMIFLAG));
}
@@ -6199,7 +6199,7 @@ wmi_ap_set_mlme(struct wmi_t *wmip, u8 cmd, u8 *mac, u16 reason)
A_MEMZERO(mlme, sizeof(*mlme));
mlme->cmd = cmd;
- A_MEMCPY(mlme->mac, mac, ATH_MAC_LEN);
+ memcpy(mlme->mac, mac, ATH_MAC_LEN);
mlme->reason = reason;
return (wmi_cmd_send(wmip, osbuf, WMI_AP_SET_MLME_CMDID, NO_SYNC_WMIFLAG));
@@ -6392,7 +6392,7 @@ wmi_set_ht_cap_cmd(struct wmi_t *wmip, WMI_SET_HT_CAP_CMD *cmd)
htCap = (WMI_SET_HT_CAP_CMD *)(A_NETBUF_DATA(osbuf));
A_MEMZERO(htCap, sizeof(*htCap));
- A_MEMCPY(htCap, cmd, sizeof(*htCap));
+ memcpy(htCap, cmd, sizeof(*htCap));
return (wmi_cmd_send(wmip, osbuf, WMI_SET_HT_CAP_CMDID,
NO_SYNC_WMIFLAG));
@@ -6434,7 +6434,7 @@ wmi_set_tx_select_rates_cmd(struct wmi_t *wmip, u32 *pMaskArray)
A_NETBUF_PUT(osbuf, sizeof(*pData));
pData = (WMI_SET_TX_SELECT_RATES_CMD *)(A_NETBUF_DATA(osbuf));
- A_MEMCPY(pData, pMaskArray, sizeof(*pData));
+ memcpy(pData, pMaskArray, sizeof(*pData));
return (wmi_cmd_send(wmip, osbuf, WMI_SET_TX_SELECT_RATES_CMDID,
NO_SYNC_WMIFLAG));
@@ -6456,7 +6456,7 @@ wmi_send_hci_cmd(struct wmi_t *wmip, u8 *buf, u16 sz)
cmd = (WMI_HCI_CMD *)(A_NETBUF_DATA(osbuf));
cmd->cmd_buf_sz = sz;
- A_MEMCPY(cmd->buf, buf, sz);
+ memcpy(cmd->buf, buf, sz);
return (wmi_cmd_send(wmip, osbuf, WMI_HCI_CMD_CMDID, NO_SYNC_WMIFLAG));
}
@@ -6604,7 +6604,7 @@ wmi_set_pmk_cmd(struct wmi_t *wmip, u8 *pmk)
p = (WMI_SET_PMK_CMD *)(A_NETBUF_DATA(osbuf));
A_MEMZERO(p, sizeof(*p));
- A_MEMCPY(p->pmk, pmk, WMI_PMK_LEN);
+ memcpy(p->pmk, pmk, WMI_PMK_LEN);
return (wmi_cmd_send(wmip, osbuf, WMI_SET_PMK_CMDID, NO_SYNC_WMIFLAG));
}
--
1.7.4.15.g7811d
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 03/20] ath6kl: s|A_MEMCMP|memcmp|g
2011-03-11 2:55 [PATCH 00/20] ath6kl: first series of cleanups Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 01/20] staging: ath6kl: Cast variable to size_t to avoid compile warning Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 02/20] ath6kl: s|A_MEMCPY|memcpy|g Luis R. Rodriguez
@ 2011-03-11 2:55 ` Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 04/20] ath6kl: remove-typedef: A_UCHAR Luis R. Rodriguez
` (17 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Luis R. Rodriguez @ 2011-03-11 2:55 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-wireless, vmehta, naveen.singh, Luis R. Rodriguez
for i in $(find ./drivers/staging/ath6kl/ -name \*.[ch]) ; do \
sed -r -i -e "s/A_MEMCMP/memcmp/g" $i; done
Cc: Naveen Singh <naveen.singh@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/staging/ath6kl/miscdrv/common_drv.c | 4 ++--
drivers/staging/ath6kl/os/linux/ar6000_drv.c | 6 +++---
drivers/staging/ath6kl/os/linux/cfg80211.c | 8 ++++----
.../staging/ath6kl/os/linux/include/osapi_linux.h | 2 --
drivers/staging/ath6kl/os/linux/ioctl.c | 6 +++---
drivers/staging/ath6kl/os/linux/wireless_ext.c | 8 ++++----
drivers/staging/ath6kl/wlan/include/ieee80211.h | 2 +-
drivers/staging/ath6kl/wlan/src/wlan_node.c | 8 ++++----
8 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/drivers/staging/ath6kl/miscdrv/common_drv.c b/drivers/staging/ath6kl/miscdrv/common_drv.c
index 7a77290..a01f5d7 100644
--- a/drivers/staging/ath6kl/miscdrv/common_drv.c
+++ b/drivers/staging/ath6kl/miscdrv/common_drv.c
@@ -877,7 +877,7 @@ static ATH_DEBUG_MODULE_DBG_INFO *FindModule(char *module_name)
while (pInfo != NULL) {
/* TODO: need to use something other than strlen */
- if (A_MEMCMP(pInfo->ModuleName,module_name,strlen(module_name)) == 0) {
+ if (memcmp(pInfo->ModuleName,module_name,strlen(module_name)) == 0) {
break;
}
pInfo = pInfo->pNext;
@@ -916,7 +916,7 @@ void a_dump_module_debug_info_by_name(char *module_name)
return;
}
- if (A_MEMCMP(module_name,"all",3) == 0) {
+ if (memcmp(module_name,"all",3) == 0) {
/* dump all */
while (pInfo != NULL) {
a_dump_module_debug_info(pInfo);
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
index 2111e99..e8277ff 100644
--- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c
+++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
@@ -4291,7 +4291,7 @@ ar6000_connect_event(AR_SOFTC_T *ar, u16 channel, u8 *bssid,
if(ar->arNetworkType & AP_NETWORK) {
struct net_device *dev = ar->arNetDev;
- if(A_MEMCMP(dev->dev_addr, bssid, ATH_MAC_LEN)==0) {
+ if(memcmp(dev->dev_addr, bssid, ATH_MAC_LEN)==0) {
ar->arACS = channel;
ik = &ar->ap_mode_bkey;
@@ -4605,7 +4605,7 @@ u8 remove_sta(AR_SOFTC_T *ar, u8 *mac, u16 reason)
}
} else {
for(i=0; i < AP_MAX_NUM_STA; i++) {
- if(A_MEMCMP(ar->sta_list[i].mac, mac, ATH_MAC_LEN)==0) {
+ if(memcmp(ar->sta_list[i].mac, mac, ATH_MAC_LEN)==0) {
A_PRINTF("DEL STA %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x "
" aid=%d REASON=%d\n", mac[0], mac[1], mac[2],
mac[3], mac[4], mac[5], ar->sta_list[i].aid, reason);
@@ -6281,7 +6281,7 @@ ap_set_wapi_key(struct ar6_softc *ar, void *ikey)
KEY_USAGE keyUsage = 0;
int status;
- if (A_MEMCMP(ik->ik_macaddr, bcast_mac, IEEE80211_ADDR_LEN) == 0) {
+ if (memcmp(ik->ik_macaddr, bcast_mac, IEEE80211_ADDR_LEN) == 0) {
keyUsage = GROUP_USAGE;
} else {
keyUsage = PAIRWISE_USAGE;
diff --git a/drivers/staging/ath6kl/os/linux/cfg80211.c b/drivers/staging/ath6kl/os/linux/cfg80211.c
index 415b253..2edac07 100644
--- a/drivers/staging/ath6kl/os/linux/cfg80211.c
+++ b/drivers/staging/ath6kl/os/linux/cfg80211.c
@@ -305,7 +305,7 @@ ar6k_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
if(ar->arConnected == true &&
ar->arSsidLen == sme->ssid_len &&
- !A_MEMCMP(ar->arSsid, sme->ssid, ar->arSsidLen)) {
+ !memcmp(ar->arSsid, sme->ssid, ar->arSsidLen)) {
reconnect_flag = true;
status = wmi_reconnect_cmd(ar->arWmi,
ar->arReqBssid,
@@ -318,7 +318,7 @@ ar6k_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
}
return 0;
} else if(ar->arSsidLen == sme->ssid_len &&
- !A_MEMCMP(ar->arSsid, sme->ssid, ar->arSsidLen)) {
+ !memcmp(ar->arSsid, sme->ssid, ar->arSsidLen)) {
ar6000_disconnect(ar);
}
@@ -332,7 +332,7 @@ ar6k_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
A_MEMZERO(ar->arReqBssid, sizeof(ar->arReqBssid));
if(sme->bssid){
- if(A_MEMCMP(&sme->bssid, bcast_mac, AR6000_ETH_ADDR_LEN)) {
+ if(memcmp(&sme->bssid, bcast_mac, AR6000_ETH_ADDR_LEN)) {
memcpy(ar->arReqBssid, sme->bssid, sizeof(ar->arReqBssid));
}
}
@@ -1321,7 +1321,7 @@ ar6k_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
A_MEMZERO(ar->arReqBssid, sizeof(ar->arReqBssid));
if(ibss_param->bssid) {
- if(A_MEMCMP(&ibss_param->bssid, bcast_mac, AR6000_ETH_ADDR_LEN)) {
+ if(memcmp(&ibss_param->bssid, bcast_mac, AR6000_ETH_ADDR_LEN)) {
memcpy(ar->arReqBssid, ibss_param->bssid, sizeof(ar->arReqBssid));
}
}
diff --git a/drivers/staging/ath6kl/os/linux/include/osapi_linux.h b/drivers/staging/ath6kl/os/linux/include/osapi_linux.h
index cdb4195..53b500c 100644
--- a/drivers/staging/ath6kl/os/linux/include/osapi_linux.h
+++ b/drivers/staging/ath6kl/os/linux/include/osapi_linux.h
@@ -77,7 +77,6 @@
#define A_CPU2BE32(x) htonl(x)
#define A_MEMZERO(addr, len) memset(addr, 0, len)
-#define A_MEMCMP(addr1, addr2, len) memcmp((addr1), (addr2), (len))
#define A_MALLOC(size) kmalloc((size), GFP_KERNEL)
#define A_MALLOC_NOWAIT(size) kmalloc((size), GFP_ATOMIC)
#define A_FREE(addr) kfree(addr)
@@ -364,7 +363,6 @@ static inline void *A_ALIGN_TO_CACHE_LINE(void *ptr) {
#define POSTPACK __ATTRIB_PACK
#define A_MEMZERO(addr, len) memset((addr), 0, (len))
-#define A_MEMCMP(addr1, addr2, len) memcmp((addr1), (addr2), (len))
#define A_MALLOC(size) malloc(size)
#define A_FREE(addr) free(addr)
diff --git a/drivers/staging/ath6kl/os/linux/ioctl.c b/drivers/staging/ath6kl/os/linux/ioctl.c
index 9a7f920..a95b743 100644
--- a/drivers/staging/ath6kl/os/linux/ioctl.c
+++ b/drivers/staging/ath6kl/os/linux/ioctl.c
@@ -555,7 +555,7 @@ ar6000_ioctl_set_badAp(struct net_device *dev, struct ifreq *rq)
return -EIO;
}
- if (A_MEMCMP(cmd.bssid, null_mac, AR6000_ETH_ADDR_LEN) == 0) {
+ if (memcmp(cmd.bssid, null_mac, AR6000_ETH_ADDR_LEN) == 0) {
/*
* This is a delete badAP.
*/
@@ -3127,7 +3127,7 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
sizeof(adhocBssid)))
{
ret = -EFAULT;
- } else if (A_MEMCMP(adhocBssid.bssid, bcast_mac,
+ } else if (memcmp(adhocBssid.bssid, bcast_mac,
AR6000_ETH_ADDR_LEN) == 0)
{
ret = -EFAULT;
@@ -4714,7 +4714,7 @@ u8 mac_cmp_wild(u8 *mac, u8 *new_mac, u8 wild, u8 new_wild)
if((wild & 1<<i) && (new_wild & 1<<i)) continue;
if(mac[i] != new_mac[i]) return 1;
}
- if((A_MEMCMP(new_mac, null_mac, 6)==0) && new_wild &&
+ if((memcmp(new_mac, null_mac, 6)==0) && new_wild &&
(wild != new_wild)) {
return 1;
}
diff --git a/drivers/staging/ath6kl/os/linux/wireless_ext.c b/drivers/staging/ath6kl/os/linux/wireless_ext.c
index 8262fde..824f1be 100644
--- a/drivers/staging/ath6kl/os/linux/wireless_ext.c
+++ b/drivers/staging/ath6kl/os/linux/wireless_ext.c
@@ -504,7 +504,7 @@ ar6000_ioctl_siwessid(struct net_device *dev,
if (ar->arNextMode == AP_NETWORK) {
/* SSID change for AP network - Will take effect on commit */
- if(A_MEMCMP(ar->arSsid,ssid,32) != 0) {
+ if(memcmp(ar->arSsid,ssid,32) != 0) {
ar->arSsidLen = data->length - 1;
memcpy(ar->arSsid, ssid, ar->arSsidLen);
ar->ap_profile_flag = 1; /* There is a change in profile */
@@ -581,7 +581,7 @@ ar6000_ioctl_siwessid(struct net_device *dev,
(!data->flags)))
{
if ((!data->flags) ||
- (A_MEMCMP(ar->arSsid, ssid, ar->arSsidLen) != 0) ||
+ (memcmp(ar->arSsid, ssid, ar->arSsidLen) != 0) ||
(ar->arSsidLen != (data->length - 1)))
{
/*
@@ -1618,7 +1618,7 @@ static int ar6000_set_wapi_key(struct net_device *dev,
keyLen = erq->length - sizeof(struct iw_encode_ext);
memcpy(wapiKeyRsc, ext->tx_seq, sizeof(wapiKeyRsc));
- if (A_MEMCMP(ext->addr.sa_data, broadcastMac, sizeof(broadcastMac)) == 0) {
+ if (memcmp(ext->addr.sa_data, broadcastMac, sizeof(broadcastMac)) == 0) {
keyUsage |= GROUP_USAGE;
PN = (u32 *)wapiKeyRsc;
for (i = 0; i < 4; i++) {
@@ -2315,7 +2315,7 @@ ar6000_ioctl_siwap(struct net_device *dev,
return -EIO;
}
- if (A_MEMCMP(&ap_addr->sa_data, bcast_mac, AR6000_ETH_ADDR_LEN) == 0) {
+ if (memcmp(&ap_addr->sa_data, bcast_mac, AR6000_ETH_ADDR_LEN) == 0) {
A_MEMZERO(ar->arReqBssid, sizeof(ar->arReqBssid));
} else {
memcpy(ar->arReqBssid, &ap_addr->sa_data, sizeof(ar->arReqBssid));
diff --git a/drivers/staging/ath6kl/wlan/include/ieee80211.h b/drivers/staging/ath6kl/wlan/include/ieee80211.h
index dfad19a..532ab0e 100644
--- a/drivers/staging/ath6kl/wlan/include/ieee80211.h
+++ b/drivers/staging/ath6kl/wlan/include/ieee80211.h
@@ -68,7 +68,7 @@
#define IEEE80211_ADDR_EQ(addr1, addr2) \
- (A_MEMCMP(addr1, addr2, IEEE80211_ADDR_LEN) == 0)
+ (memcmp(addr1, addr2, IEEE80211_ADDR_LEN) == 0)
#define IEEE80211_ADDR_COPY(dst,src) memcpy(dst,src,IEEE80211_ADDR_LEN)
diff --git a/drivers/staging/ath6kl/wlan/src/wlan_node.c b/drivers/staging/ath6kl/wlan/src/wlan_node.c
index c99a330..0edf9c1 100644
--- a/drivers/staging/ath6kl/wlan/src/wlan_node.c
+++ b/drivers/staging/ath6kl/wlan/src/wlan_node.c
@@ -334,7 +334,7 @@ wlan_refresh_inactive_nodes (struct ieee80211_node_table *nt)
while (bss != NULL)
{
nextBss = bss->ni_list_next;
- if (A_MEMCMP(myBssid, bss->ni_macaddr, sizeof(myBssid)) != 0)
+ if (memcmp(myBssid, bss->ni_macaddr, sizeof(myBssid)) != 0)
{
/*
* free up all but the current bss - if set
@@ -357,7 +357,7 @@ wlan_refresh_inactive_nodes (struct ieee80211_node_table *nt)
while (bss != NULL)
{
nextBss = bss->ni_list_next;
- if (A_MEMCMP(myBssid, bss->ni_macaddr, sizeof(myBssid)) != 0)
+ if (memcmp(myBssid, bss->ni_macaddr, sizeof(myBssid)) != 0)
{
if (((now - bss->ni_tstamp) > timeoutValue) || --bss->ni_actcnt == 0)
@@ -391,7 +391,7 @@ wlan_node_timeout (A_ATH_TIMER arg)
while (bss != NULL)
{
nextBss = bss->ni_list_next;
- if (A_MEMCMP(myBssid, bss->ni_macaddr, sizeof(myBssid)) != 0)
+ if (memcmp(myBssid, bss->ni_macaddr, sizeof(myBssid)) != 0)
{
if ((now - bss->ni_tstamp) > timeoutValue)
@@ -539,7 +539,7 @@ wlan_node_remove(struct ieee80211_node_table *nt, u8 *bssid)
{
nextBss = bss->ni_list_next;
- if (A_MEMCMP(bssid, bss->ni_macaddr, 6) == 0)
+ if (memcmp(bssid, bss->ni_macaddr, 6) == 0)
{
wlan_node_remove_core (nt, bss);
IEEE80211_NODE_UNLOCK(nt);
--
1.7.4.15.g7811d
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 04/20] ath6kl: remove-typedef: A_UCHAR
2011-03-11 2:55 [PATCH 00/20] ath6kl: first series of cleanups Luis R. Rodriguez
` (2 preceding siblings ...)
2011-03-11 2:55 ` [PATCH 03/20] ath6kl: s|A_MEMCMP|memcmp|g Luis R. Rodriguez
@ 2011-03-11 2:55 ` Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 05/20] ath6kl: remove-typedef AGGR_INFO Luis R. Rodriguez
` (16 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Luis R. Rodriguez @ 2011-03-11 2:55 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-wireless, vmehta, naveen.singh, Luis R. Rodriguez
remove-typedef -s A_UCHAR u8 drivers/staging/ath6kl/
This uses the remove-typedef utility:
http://www.kernel.org/pub/linux/kernel/people/mcgrof/scripts/remove-typedef
Cc: Naveen Singh <naveen.singh@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
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 | 13 +---
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, 163 insertions(+), 171 deletions(-)
diff --git a/drivers/staging/ath6kl/bmi/include/bmi_internal.h b/drivers/staging/ath6kl/bmi/include/bmi_internal.h
index ebc037d..e13fb01 100644
--- a/drivers/staging/ath6kl/bmi/include/bmi_internal.h
+++ b/drivers/staging/ath6kl/bmi/include/bmi_internal.h
@@ -43,12 +43,12 @@ static bool bmiDone;
int
bmiBufferSend(HIF_DEVICE *device,
- A_UCHAR *buffer,
+ u8 *buffer,
u32 length);
int
bmiBufferReceive(HIF_DEVICE *device,
- A_UCHAR *buffer,
+ u8 *buffer,
u32 length,
bool want_timeout);
diff --git a/drivers/staging/ath6kl/bmi/src/bmi.c b/drivers/staging/ath6kl/bmi/src/bmi.c
index 1e1e6ee..37f7cbc 100644
--- a/drivers/staging/ath6kl/bmi/src/bmi.c
+++ b/drivers/staging/ath6kl/bmi/src/bmi.c
@@ -55,7 +55,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 */ + \
@@ -84,7 +84,7 @@ 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);
}
@@ -120,7 +120,7 @@ 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"));
return A_ERROR;
@@ -155,13 +155,13 @@ BMIGetTargetInfo(HIF_DEVICE *device, struct bmi_target_info *targ_info)
AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Get Target Info: Enter (device: 0x%p)\n", 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, ("Unable to read Target Version from the device\n"));
@@ -170,7 +170,7 @@ BMIGetTargetInfo(HIF_DEVICE *device, struct bmi_target_info *targ_info)
if (targ_info->target_ver == TARGET_VERSION_SENTINAL) {
/* Determine how many bytes are in the Target's targ_info */
- status = bmiBufferReceive(device, (A_UCHAR *)&targ_info->target_info_byte_count,
+ status = bmiBufferReceive(device, (u8 *)&targ_info->target_info_byte_count,
sizeof(targ_info->target_info_byte_count), true);
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read Target Info Byte Count from the device\n"));
@@ -185,7 +185,7 @@ BMIGetTargetInfo(HIF_DEVICE *device, struct bmi_target_info *targ_info)
/* Read the remainder of the targ_info */
status = bmiBufferReceive(device,
- ((A_UCHAR *)targ_info)+sizeof(targ_info->target_info_byte_count),
+ ((u8 *)targ_info)+sizeof(targ_info->target_info_byte_count),
sizeof(*targ_info)-sizeof(targ_info->target_info_byte_count), true);
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read Target Info (%d bytes) from the device\n",
@@ -203,7 +203,7 @@ BMIGetTargetInfo(HIF_DEVICE *device, struct bmi_target_info *targ_info)
int
BMIReadMemory(HIF_DEVICE *device,
u32 address,
- A_UCHAR *buffer,
+ u8 *buffer,
u32 length)
{
u32 cid;
@@ -259,7 +259,7 @@ BMIReadMemory(HIF_DEVICE *device,
int
BMIWriteMemory(HIF_DEVICE *device,
u32 address,
- A_UCHAR *buffer,
+ u8 *buffer,
u32 length)
{
u32 cid;
@@ -267,8 +267,8 @@ BMIWriteMemory(HIF_DEVICE *device,
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);
@@ -647,7 +647,7 @@ BMIrompatchDeactivate(HIF_DEVICE *device,
int
BMILZData(HIF_DEVICE *device,
- A_UCHAR *buffer,
+ u8 *buffer,
u32 length)
{
u32 cid;
@@ -735,7 +735,7 @@ BMILZStreamStart(HIF_DEVICE *device,
/* BMI Access routines */
int
bmiBufferSend(HIF_DEVICE *device,
- A_UCHAR *buffer,
+ u8 *buffer,
u32 length)
{
int status;
@@ -783,7 +783,7 @@ bmiBufferSend(HIF_DEVICE *device,
int
bmiBufferReceive(HIF_DEVICE *device,
- A_UCHAR *buffer,
+ u8 *buffer,
u32 length,
bool want_timeout)
{
@@ -958,7 +958,7 @@ bmiBufferReceive(HIF_DEVICE *device,
}
int
-BMIFastDownload(HIF_DEVICE *device, u32 address, A_UCHAR *buffer, u32 length)
+BMIFastDownload(HIF_DEVICE *device, u32 address, u8 *buffer, u32 length)
{
int status = A_ERROR;
u32 lastWord = 0;
@@ -998,13 +998,13 @@ BMIFastDownload(HIF_DEVICE *device, u32 address, A_UCHAR *buffer, u32 length)
}
int
-BMIRawWrite(HIF_DEVICE *device, A_UCHAR *buffer, u32 length)
+BMIRawWrite(HIF_DEVICE *device, u8 *buffer, u32 length)
{
return bmiBufferSend(device, buffer, length);
}
int
-BMIRawRead(HIF_DEVICE *device, A_UCHAR *buffer, u32 length, bool want_timeout)
+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 8ea3d02..87057e3 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 8504724..b9f8c72 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,
+ u8 *buffer,
u32 length,
u32 request,
void *context)
@@ -332,7 +332,7 @@ void AddToAsyncList(HIF_DEVICE *device, BUS_REQUEST *busrequest)
int
HIFReadWrite(HIF_DEVICE *device,
u32 address,
- A_UCHAR *buffer,
+ u8 *buffer,
u32 length,
u32 request,
void *context)
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k.c b/drivers/staging/ath6kl/htc2/AR6000/ar6k.c
index cf75c20..9090a39 100644
--- a/drivers/staging/ath6kl/htc2/AR6000/ar6k.c
+++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k.c
@@ -491,7 +491,7 @@ int DevEnableRecv(AR6K_DEVICE *pDev, bool AsyncMode)
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)
@@ -507,7 +507,7 @@ int DevWaitForPendingRecv(AR6K_DEVICE *pDev,u32 TimeoutInMs,bool *pbIsRecvPendin
status = HIFReadWrite(pDev->HIFDevice,
HOST_INT_STATUS_ADDRESS,
&host_int_status,
- sizeof(A_UCHAR),
+ sizeof(u8),
HIF_RD_SYNC_BYTE_INC,
NULL);
if (status)
diff --git a/drivers/staging/ath6kl/htc2/htc_internal.h b/drivers/staging/ath6kl/htc2/htc_internal.h
index 743469d..73f6ed9 100644
--- a/drivers/staging/ath6kl/htc2/htc_internal.h
+++ b/drivers/staging/ath6kl/htc2/htc_internal.h
@@ -178,7 +178,7 @@ void HTCFlushSendPkts(HTC_TARGET *target);
#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 57472cf..0e5430d 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 78ac597..ca0961a 100644
--- a/drivers/staging/ath6kl/include/ar6000_diag.h
+++ b/drivers/staging/ath6kl/include/ar6000_diag.h
@@ -33,11 +33,11 @@ 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 788f9af..b44988d 100644
--- a/drivers/staging/ath6kl/include/bmi.h
+++ b/drivers/staging/ath6kl/include/bmi.h
@@ -52,13 +52,13 @@ BMIGetTargetInfo(HIF_DEVICE *device, struct bmi_target_info *targ_info);
int
BMIReadMemory(HIF_DEVICE *device,
u32 address,
- A_UCHAR *buffer,
+ u8 *buffer,
u32 length);
int
BMIWriteMemory(HIF_DEVICE *device,
u32 address,
- A_UCHAR *buffer,
+ u8 *buffer,
u32 length);
int
@@ -108,23 +108,23 @@ BMILZStreamStart(HIF_DEVICE *device,
int
BMILZData(HIF_DEVICE *device,
- A_UCHAR *buffer,
+ u8 *buffer,
u32 length);
int
BMIFastDownload(HIF_DEVICE *device,
u32 address,
- A_UCHAR *buffer,
+ u8 *buffer,
u32 length);
int
BMIRawWrite(HIF_DEVICE *device,
- A_UCHAR *buffer,
+ u8 *buffer,
u32 length);
int
BMIRawRead(HIF_DEVICE *device,
- A_UCHAR *buffer,
+ u8 *buffer,
u32 length,
bool want_timeout);
diff --git a/drivers/staging/ath6kl/include/common/regulatory/reg_dbschema.h b/drivers/staging/ath6kl/include/common/regulatory/reg_dbschema.h
index 93d7c0b..4904040 100644
--- a/drivers/staging/ath6kl/include/common/regulatory/reg_dbschema.h
+++ b/drivers/staging/ath6kl/include/common/regulatory/reg_dbschema.h
@@ -124,7 +124,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 3799b68..9ca1f2a 100644
--- a/drivers/staging/ath6kl/include/common/testcmd.h
+++ b/drivers/staging/ath6kl/include/common/testcmd.h
@@ -142,7 +142,7 @@ typedef PREPACK struct {
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 a8b143a..c645af3 100644
--- a/drivers/staging/ath6kl/include/common/wmi.h
+++ b/drivers/staging/ath6kl/include/common/wmi.h
@@ -537,7 +537,7 @@ typedef PREPACK struct {
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;
@@ -3031,7 +3031,7 @@ typedef PREPACK struct {
#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 41f2b9b..0a8364c 100644
--- a/drivers/staging/ath6kl/include/common/wmi_thin.h
+++ b/drivers/staging/ath6kl/include/common/wmi_thin.h
@@ -309,7 +309,7 @@ typedef PREPACK struct {
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 141b7ef..6ed4901 100644
--- a/drivers/staging/ath6kl/include/common_drv.h
+++ b/drivers/staging/ath6kl/include/common_drv.h
@@ -70,7 +70,7 @@ int ar6000_ReadRegDiag(HIF_DEVICE *hifDevice, u32 *address, u32 *data);
int ar6000_WriteRegDiag(HIF_DEVICE *hifDevice, u32 *address, u32 *data);
-int ar6000_ReadDataDiag(HIF_DEVICE *hifDevice, u32 address, A_UCHAR *data, u32 length);
+int ar6000_ReadDataDiag(HIF_DEVICE *hifDevice, u32 address, 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 3906780..ab1f4c1 100644
--- a/drivers/staging/ath6kl/include/hif.h
+++ b/drivers/staging/ath6kl/include/hif.h
@@ -401,7 +401,7 @@ void HIFDetachHTC(HIF_DEVICE *device);
int
HIFReadWrite(HIF_DEVICE *device,
u32 address,
- A_UCHAR *buffer,
+ u8 *buffer,
u32 length,
u32 request,
void *context);
diff --git a/drivers/staging/ath6kl/include/wlan_api.h b/drivers/staging/ath6kl/include/wlan_api.h
index ba5493c..9eea587 100644
--- a/drivers/staging/ath6kl/include/wlan_api.h
+++ b/drivers/staging/ath6kl/include/wlan_api.h
@@ -108,7 +108,7 @@ void
wlan_refresh_inactive_nodes (struct ieee80211_node_table *nt);
bss_t *
-wlan_find_Ssidnode (struct ieee80211_node_table *nt, A_UCHAR *pSsid,
+wlan_find_Ssidnode (struct ieee80211_node_table *nt, u8 *pSsid,
u32 ssidLength, bool bIsWPA2, bool bMatchSSID);
void
@@ -117,7 +117,7 @@ wlan_node_return (struct ieee80211_node_table *nt, bss_t *ni);
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,
+wlan_find_matching_Ssidnode (struct ieee80211_node_table *nt, 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 7ba8505..c8583e0 100644
--- a/drivers/staging/ath6kl/include/wmi_api.h
+++ b/drivers/staging/ath6kl/include/wmi_api.h
@@ -111,7 +111,7 @@ int wmi_connect_cmd(struct wmi_t *wmip,
CRYPTO_TYPE groupCrypto,
u8 groupCryptoLen,
int ssidLength,
- A_UCHAR *ssid,
+ u8 *ssid,
u8 *bssid,
u16 channel,
u32 ctrl_flags);
@@ -134,7 +134,7 @@ int wmi_scanparams_cmd(struct wmi_t *wmip, u16 fg_start_sec,
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, u16 bmissbeacons);
int wmi_associnfo_cmd(struct wmi_t *wmip, u8 ieType,
@@ -284,7 +284,7 @@ int wmi_set_reassocmode_cmd(struct wmi_t *wmip, u8 mode);
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);
@@ -322,7 +322,7 @@ int
wmi_mcast_filter_cmd(struct wmi_t *wmip, u8 enable);
bss_t *
-wmi_find_Ssidnode (struct wmi_t *wmip, A_UCHAR *pSsid,
+wmi_find_Ssidnode (struct wmi_t *wmip, u8 *pSsid,
u32 ssidLength, bool bIsWPA2, bool bMatchSSID);
@@ -429,7 +429,7 @@ u16 wmi_ieee2freq (int chan);
u32 wmi_freq2ieee (u16 freq);
bss_t *
-wmi_find_matching_Ssidnode (struct wmi_t *wmip, A_UCHAR *pSsid,
+wmi_find_matching_Ssidnode (struct wmi_t *wmip, u8 *pSsid,
u32 ssidLength,
u32 dot11AuthMode, u32 authMode,
u32 pairwiseCryptoType, u32 grpwiseCryptoTyp);
diff --git a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
index 55b0633..3dce6f5 100644
--- a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
+++ b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
@@ -62,20 +62,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));
@@ -139,14 +139,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;
@@ -162,12 +162,12 @@ 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", MAX_FW_PATH_LEN));
goto complete;
@@ -214,7 +214,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);
@@ -248,7 +248,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);
@@ -419,7 +419,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]));
if(Data[4] == 0xFC && Data[5] == 0x00)
@@ -481,9 +481,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 };
u8 *event;
diff --git a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h
index 975bf62..b97d91f 100644
--- a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h
+++ b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h
@@ -67,9 +67,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 90ced22..300c501 100644
--- a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
+++ b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
@@ -127,13 +127,13 @@ 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,u32 *pos);
-static int AthPSCreateHCICommand(A_UCHAR Opcode, u32 Param1,PSCmdPacket *PSPatchPacket,u32 *index);
+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(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 )
@@ -315,7 +315,7 @@ unsigned int uReadDataInSection(char *pCharLine, ST_PS_DATA_FORMAT stPS_DataForm
return (0x0FFF);
}
}
-int AthParseFilesUnified(A_UCHAR *srcbuffer,u32 srclen, int FileFormat)
+int AthParseFilesUnified(u8 *srcbuffer,u32 srclen, int FileFormat)
{
char *Buffer;
char *pCharLine;
@@ -558,7 +558,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;
@@ -579,7 +579,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];
@@ -659,7 +659,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;
@@ -713,7 +713,7 @@ int AthDoParsePS(A_UCHAR *srcbuffer, u32 srclen)
return status;
}
-char *AthGetLine(char *buffer, int maxlen, A_UCHAR *srcbuffer,u32 len,u32 *pos)
+char *AthGetLine(char *buffer, int maxlen, u8 *srcbuffer,u32 len,u32 *pos)
{
int count;
@@ -751,7 +751,7 @@ char *AthGetLine(char *buffer, int maxlen, A_UCHAR *srcbuffer,u32 len,u32 *pos)
return buffer;
}
-static void LoadHeader(A_UCHAR *HCI_PS_Command,A_UCHAR opcode,int length,int index){
+static void LoadHeader(u8 *HCI_PS_Command,u8 opcode,int length,int index){
HCI_PS_Command[0]= 0x0B;
HCI_PS_Command[1]= 0xFC;
@@ -833,9 +833,9 @@ int AthCreateCommandList(PSCmdPacket **HciPacketList, u32 *numPackets)
////////////////////////
/////////////
-static int AthPSCreateHCICommand(A_UCHAR Opcode, u32 Param1,PSCmdPacket *PSPatchPacket,u32 *index)
+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;
@@ -846,7 +846,7 @@ static int AthPSCreateHCICommand(A_UCHAR Opcode, u32 Param1,PSCmdPacket *PSPatch
for(i=0;i< Param1;i++){
- HCI_PS_Command = (A_UCHAR *) A_MALLOC(RamPatch[i].Len+HCI_COMMAND_HEADER);
+ HCI_PS_Command = (u8 *) A_MALLOC(RamPatch[i].Len+HCI_COMMAND_HEADER);
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Allocated Buffer Size %d\n",RamPatch[i].Len+HCI_COMMAND_HEADER));
if(HCI_PS_Command == NULL){
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("MALLOC Failed\r\n"));
@@ -871,7 +871,7 @@ static int AthPSCreateHCICommand(A_UCHAR Opcode, u32 Param1,PSCmdPacket *PSPatch
Length = 0;
i= 0;
- HCI_PS_Command = (A_UCHAR *) A_MALLOC(Length+HCI_COMMAND_HEADER);
+ HCI_PS_Command = (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;
@@ -888,7 +888,7 @@ static int AthPSCreateHCICommand(A_UCHAR Opcode, u32 Param1,PSCmdPacket *PSPatch
case PS_RESET:
Length = 0x06;
i=0;
- HCI_PS_Command = (A_UCHAR *) A_MALLOC(Length+HCI_COMMAND_HEADER);
+ HCI_PS_Command = (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;
@@ -909,7 +909,7 @@ static int AthPSCreateHCICommand(A_UCHAR Opcode, u32 Param1,PSCmdPacket *PSPatch
if(PsTagEntry[i].TagId ==1)
BDADDR = true;
- HCI_PS_Command = (A_UCHAR *) A_MALLOC(PsTagEntry[i].TagLen+HCI_COMMAND_HEADER);
+ HCI_PS_Command = (u8 *) A_MALLOC(PsTagEntry[i].TagLen+HCI_COMMAND_HEADER);
if(HCI_PS_Command == NULL){
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("MALLOC Failed\r\n"));
return A_ERROR;
@@ -936,7 +936,7 @@ static int AthPSCreateHCICommand(A_UCHAR Opcode, u32 Param1,PSCmdPacket *PSPatch
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("VALUE of CRC:%d At index %d\r\n",Param1,*index));
- HCI_PS_Command = (A_UCHAR *) A_MALLOC(Length+HCI_COMMAND_HEADER);
+ HCI_PS_Command = (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 fdc1c94..62e298d 100644
--- a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h
+++ b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h
@@ -48,13 +48,6 @@
/* Helper data type declaration */
-#ifndef u32 #define A_UCHAR unsigned char
-#define u32 unsigned long
-#define u16 unsigned short
-#define u8 unsigned char
-#define bool unsigned char
-#endif /* u32 */
-
#define ATH_DEBUG_ERR (1 << 0)
#define ATH_DEBUG_WARN (1 << 1)
#define ATH_DEBUG_INFO (1 << 2)
@@ -98,15 +91,15 @@
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 a01f5d7..b5f74c5 100644
--- a/drivers/staging/ath6kl/miscdrv/common_drv.c
+++ b/drivers/staging/ath6kl/miscdrv/common_drv.c
@@ -123,7 +123,7 @@ int ar6000_SetAddressWindowRegister(HIF_DEVICE *hifDevice, u32 RegisterAddr, u32
* 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);
@@ -152,7 +152,7 @@ int ar6000_SetAddressWindowRegister(HIF_DEVICE *hifDevice, u32 RegisterAddr, u32
* 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);
@@ -166,7 +166,7 @@ int ar6000_SetAddressWindowRegister(HIF_DEVICE *hifDevice, u32 RegisterAddr, u32
/* 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);
@@ -203,7 +203,7 @@ 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);
@@ -228,7 +228,7 @@ 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);
@@ -245,7 +245,7 @@ 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;
@@ -263,7 +263,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;
@@ -283,8 +283,8 @@ 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);
status = HIFReadWrite(hifDevice,
@@ -301,7 +301,7 @@ 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);
@@ -489,7 +489,7 @@ 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,
+ (u8 *)&eepHeaderAddr,
4)!= 0)
{
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("BMIReadMemory for reading board data address failed \n"));
@@ -595,7 +595,7 @@ void ar6000_dump_target_assert_info(HIF_DEVICE *hifDevice, u32 TargetType)
/* fetch register dump data */
status = ar6000_ReadDataDiag(hifDevice,
regDumpArea,
- (A_UCHAR *)®DumpValues[0],
+ (u8 *)®DumpValues[0],
regDumpCount * (sizeof(u32)));
if (status) {
@@ -654,7 +654,7 @@ int ar6000_set_htc_params(HIF_DEVICE *hifDevice,
/* set the host interest area for the block size */
status = BMIWriteMemory(hifDevice,
HOST_INTEREST_ITEM_ADDRESS(TargetType, hi_mbox_io_block_sz),
- (A_UCHAR *)&blocksizes[1],
+ (u8 *)&blocksizes[1],
4);
if (status) {
@@ -669,7 +669,7 @@ int ar6000_set_htc_params(HIF_DEVICE *hifDevice,
/* set the host interest area for the mbox ISR yield limit */
status = BMIWriteMemory(hifDevice,
HOST_INTEREST_ITEM_ADDRESS(TargetType, hi_mbox_isr_yield_limit),
- (A_UCHAR *)&MboxIsrYieldValue,
+ (u8 *)&MboxIsrYieldValue,
4);
if (status) {
@@ -796,7 +796,7 @@ 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];
@@ -1015,7 +1015,7 @@ int ar6000_set_hci_bridge_flags(HIF_DEVICE *hifDevice,
/* set hci bridge flags */
status = BMIWriteMemory(hifDevice,
HOST_INTEREST_ITEM_ADDRESS(TargetType, hi_hci_bridge_flags),
- (A_UCHAR *)&Flags,
+ (u8 *)&Flags,
4);
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
index e8277ff..f8d8999 100644
--- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c
+++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
@@ -416,7 +416,7 @@ 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;
@@ -433,7 +433,7 @@ u32 dbglog_get_debug_hdr_ptr(AR_SOFTC_T *ar)
address = TARG_VTOP(ar->arTargetType, HOST_INTEREST_ITEM_ADDRESS(ar, hi_dbglog_hdr));
if ((status = ar6000_ReadDataDiag(ar->arHifDevice, address,
- (A_UCHAR *)¶m, 4)) != 0)
+ (u8 *)¶m, 4)) != 0)
{
param = 0;
}
@@ -550,13 +550,13 @@ 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, length);
+ ar6000_ReadDataDiag(ar->arHifDevice, address, (u8 *)data, length);
address = TARG_VTOP(ar->arTargetType, data[0] /* dbuf */);
firstbuf = address;
dropped = data[1]; /* dropped */
length = 4 /* sizeof(next) */ + 4 /* sizeof(buffer) */ + 4 /* sizeof(bufsize) */ + 4 /* sizeof(length) */ + 4 /* sizeof(count) */ + 4 /* sizeof(free) */;
A_MEMZERO(data, sizeof(data));
- ar6000_ReadDataDiag(ar->arHifDevice, address, (A_UCHAR *)&data, length);
+ ar6000_ReadDataDiag(ar->arHifDevice, address, (u8 *)&data, length);
do {
address = TARG_VTOP(ar->arTargetType, data[1] /* buffer*/);
@@ -567,7 +567,7 @@ ar6000_dbglog_get_debug_logs(AR_SOFTC_T *ar)
ar->log_cnt = 0;
}
if(0 != ar6000_ReadDataDiag(ar->arHifDevice, address,
- (A_UCHAR *)&ar->log_buffer[ar->log_cnt], length))
+ (u8 *)&ar->log_buffer[ar->log_cnt], length))
{
break;
}
@@ -582,7 +582,7 @@ ar6000_dbglog_get_debug_logs(AR_SOFTC_T *ar)
length = 4 /* sizeof(next) */ + 4 /* sizeof(buffer) */ + 4 /* sizeof(bufsize) */ + 4 /* sizeof(length) */ + 4 /* sizeof(count) */ + 4 /* sizeof(free) */;
A_MEMZERO(data, sizeof(data));
if(0 != ar6000_ReadDataDiag(ar->arHifDevice, address,
- (A_UCHAR *)&data, length))
+ (u8 *)&data, length))
{
break;
}
@@ -816,7 +816,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;
}
@@ -843,7 +843,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;
}
@@ -900,7 +900,7 @@ 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;
@@ -916,12 +916,12 @@ void calculate_crc(u32 TargetType, A_UCHAR *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);
}
@@ -941,17 +941,17 @@ 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 + AR6002_MAC_ADDRESS_OFFSET);
+ ptr_mac = (u8 *)((u8 *)eeprom_data + AR6002_MAC_ADDRESS_OFFSET);
break;
case TARGET_TYPE_AR6003:
- ptr_mac = (u8 *)((A_UCHAR *)eeprom_data + AR6003_MAC_ADDRESS_OFFSET);
+ ptr_mac = (u8 *)((u8 *)eeprom_data + AR6003_MAC_ADDRESS_OFFSET);
break;
default:
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Invalid Target Type\n"));
@@ -1097,7 +1097,7 @@ ar6000_transfer_bin_file(AR_SOFTC_T *ar, AR6K_BIN_FILE file, u32 address, bool c
#ifdef SOFTMAC_FILE_USED
if (file==AR6K_BOARD_DATA_FILE && fw_entry->data) {
- ar6000_softmac_update(ar, (A_UCHAR *)fw_entry->data, fw_entry->size);
+ ar6000_softmac_update(ar, (u8 *)fw_entry->data, fw_entry->size);
}
#endif
@@ -1117,14 +1117,14 @@ ar6000_transfer_bin_file(AR_SOFTC_T *ar, AR6K_BIN_FILE file, u32 address, bool c
(((ar)->arTargetType == TARGET_TYPE_AR6003) ? AR6003_BOARD_DATA_SZ : 0));
/* Determine where in Target RAM to write Board Data */
- bmifn(BMIReadMemory(ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_board_ext_data), (A_UCHAR *)&board_ext_address, 4));
+ bmifn(BMIReadMemory(ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_board_ext_data), (u8 *)&board_ext_address, 4));
AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("Board extended Data download address: 0x%x\n", board_ext_address));
/* check whether the target has allocated memory for extended board data and file contains extended board data */
if ((board_ext_address) && (fw_entry->size == (board_data_size + board_ext_data_size))) {
u32 param;
- status = BMIWriteMemory(ar->arHifDevice, board_ext_address, (A_UCHAR *)(fw_entry->data + board_data_size), board_ext_data_size);
+ status = BMIWriteMemory(ar->arHifDevice, board_ext_address, (u8 *)(fw_entry->data + board_data_size), board_ext_data_size);
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("BMI operation failed: %d\n", __LINE__));
@@ -1134,15 +1134,15 @@ ar6000_transfer_bin_file(AR_SOFTC_T *ar, AR6K_BIN_FILE file, u32 address, bool c
/* Record the fact that extended board Data IS initialized */
param = 1;
- bmifn(BMIWriteMemory(ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_board_ext_data_initialized), (A_UCHAR *)¶m, 4));
+ bmifn(BMIWriteMemory(ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_board_ext_data_initialized), (u8 *)¶m, 4));
}
fw_entry_size = board_data_size;
}
if (compressed) {
- status = BMIFastDownload(ar->arHifDevice, address, (A_UCHAR *)fw_entry->data, fw_entry_size);
+ status = BMIFastDownload(ar->arHifDevice, address, (u8 *)fw_entry->data, fw_entry_size);
} else {
- status = BMIWriteMemory(ar->arHifDevice, address, (A_UCHAR *)fw_entry->data, fw_entry_size);
+ status = BMIWriteMemory(ar->arHifDevice, address, (u8 *)fw_entry->data, fw_entry_size);
}
if (status) {
@@ -1163,13 +1163,13 @@ ar6000_update_bdaddr(AR_SOFTC_T *ar)
u32 address;
if (BMIReadMemory(ar->arHifDevice,
- HOST_INTEREST_ITEM_ADDRESS(ar, hi_board_data), (A_UCHAR *)&address, 4) != 0)
+ HOST_INTEREST_ITEM_ADDRESS(ar, hi_board_data), (u8 *)&address, 4) != 0)
{
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("BMIReadMemory for hi_board_data failed\n"));
return A_ERROR;
}
- if (BMIReadMemory(ar->arHifDevice, address + BDATA_BDADDR_OFFSET, (A_UCHAR *)ar->bdaddr, 6) != 0)
+ if (BMIReadMemory(ar->arHifDevice, address + BDATA_BDADDR_OFFSET, (u8 *)ar->bdaddr, 6) != 0)
{
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("BMIReadMemory for BD address failed\n"));
return A_ERROR;
@@ -1234,7 +1234,7 @@ ar6000_sysfs_bmi_get_config(AR_SOFTC_T *ar, u32 mode)
param = 0;
if (ar->arTargetType == TARGET_TYPE_AR6002) {
- bmifn(BMIReadMemory(ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_ext_clk_detected), (A_UCHAR *)¶m, 4));
+ bmifn(BMIReadMemory(ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_ext_clk_detected), (u8 *)¶m, 4));
}
/* LPO_CAL.ENABLE = 1 if no external clk is detected */
@@ -1267,7 +1267,7 @@ ar6000_sysfs_bmi_get_config(AR_SOFTC_T *ar, u32 mode)
if (ar->arTargetType == TARGET_TYPE_AR6003) {
/* hi_ext_clk_detected = 0 */
param = 0;
- bmifn(BMIWriteMemory(ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_ext_clk_detected), (A_UCHAR *)¶m, 4));
+ bmifn(BMIWriteMemory(ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_ext_clk_detected), (u8 *)¶m, 4));
/* CLOCK_CONTROL &= ~LF_CLK32 */
address = RTC_BASE_ADDRESS + CLOCK_CONTROL_ADDRESS;
@@ -1280,7 +1280,7 @@ ar6000_sysfs_bmi_get_config(AR_SOFTC_T *ar, u32 mode)
/* Transfer Board Data from Target EEPROM to Target RAM */
if (ar->arTargetType == TARGET_TYPE_AR6003) {
/* Determine where in Target RAM to write Board Data */
- bmifn(BMIReadMemory(ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_board_data), (A_UCHAR *)&address, 4));
+ bmifn(BMIReadMemory(ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_board_data), (u8 *)&address, 4));
AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("Board Data download address: 0x%x\n", address));
/* Write EEPROM data to Target RAM */
@@ -1290,7 +1290,7 @@ ar6000_sysfs_bmi_get_config(AR_SOFTC_T *ar, u32 mode)
/* Record the fact that Board Data IS initialized */
param = 1;
- bmifn(BMIWriteMemory(ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_board_data_initialized), (A_UCHAR *)¶m, 4));
+ bmifn(BMIWriteMemory(ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_board_data_initialized), (u8 *)¶m, 4));
/* Transfer One time Programmable data */
AR6K_DATA_DOWNLOAD_ADDRESS(address, ar->arVersion.target_ver);
@@ -1325,7 +1325,7 @@ ar6000_sysfs_bmi_get_config(AR_SOFTC_T *ar, u32 mode)
}
param = address;
- bmifn(BMIWriteMemory(ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_dset_list_head), (A_UCHAR *)¶m, 4));
+ bmifn(BMIWriteMemory(ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_dset_list_head), (u8 *)¶m, 4));
if (ar->arTargetType == TARGET_TYPE_AR6003) {
if (ar->arVersion.target_ver == AR6003_REV1_VERSION) {
@@ -1335,7 +1335,7 @@ ar6000_sysfs_bmi_get_config(AR_SOFTC_T *ar, u32 mode)
/* Reserve 6.5K of RAM */
param = 6656;
}
- bmifn(BMIWriteMemory(ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_end_RAM_reserve_sz), (A_UCHAR *)¶m, 4));
+ bmifn(BMIWriteMemory(ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_end_RAM_reserve_sz), (u8 *)¶m, 4));
}
/* Restore system sleep */
@@ -1352,7 +1352,7 @@ ar6000_sysfs_bmi_get_config(AR_SOFTC_T *ar, u32 mode)
#define CONFIG_AR600x_DEBUG_UART_TX_PIN 8
#endif
param = CONFIG_AR600x_DEBUG_UART_TX_PIN;
- bmifn(BMIWriteMemory(ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_dbg_uart_txpin), (A_UCHAR *)¶m, 4));
+ bmifn(BMIWriteMemory(ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_dbg_uart_txpin), (u8 *)¶m, 4));
#if (CONFIG_AR600x_DEBUG_UART_TX_PIN == 23)
{
@@ -1367,7 +1367,7 @@ ar6000_sysfs_bmi_get_config(AR_SOFTC_T *ar, u32 mode)
#ifdef ATH6KL_CONFIG_GPIO_BT_RESET
#define CONFIG_AR600x_BT_RESET_PIN 0x16
param = CONFIG_AR600x_BT_RESET_PIN;
- bmifn(BMIWriteMemory(ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_hci_uart_support_pins), (A_UCHAR *)¶m, 4));
+ bmifn(BMIWriteMemory(ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_hci_uart_support_pins), (u8 *)¶m, 4));
#endif /* ATH6KL_CONFIG_GPIO_BT_RESET */
/* Configure UART flow control polarity */
@@ -1378,7 +1378,7 @@ ar6000_sysfs_bmi_get_config(AR_SOFTC_T *ar, u32 mode)
#if (CONFIG_ATH6KL_BT_UART_FC_POLARITY == 1)
if (ar->arVersion.target_ver == AR6003_REV2_VERSION) {
param = ((CONFIG_ATH6KL_BT_UART_FC_POLARITY << 1) & 0x2);
- bmifn(BMIWriteMemory(ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_hci_uart_pwr_mgmt_params), (A_UCHAR *)¶m, 4));
+ bmifn(BMIWriteMemory(ar->arHifDevice, HOST_INTEREST_ITEM_ADDRESS(ar, hi_hci_uart_pwr_mgmt_params), (u8 *)¶m, 4));
}
#endif /* CONFIG_ATH6KL_BT_UART_FC_POLARITY */
}
@@ -1405,7 +1405,7 @@ ar6000_configure_target(AR_SOFTC_T *ar)
param = 1;
if (BMIWriteMemory(ar->arHifDevice,
HOST_INTEREST_ITEM_ADDRESS(ar, hi_serial_enable),
- (A_UCHAR *)¶m,
+ (u8 *)¶m,
4)!= 0)
{
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("BMIWriteMemory for enableuartprint failed \n"));
@@ -1418,7 +1418,7 @@ 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 *)¶m,
+ (u8 *)¶m,
4)!= 0)
{
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("BMIWriteMemory for htc version failed \n"));
@@ -1437,7 +1437,7 @@ ar6000_configure_target(AR_SOFTC_T *ar)
if (BMIReadMemory(ar->arHifDevice,
HOST_INTEREST_ITEM_ADDRESS(ar, hi_option_flag),
- (A_UCHAR *)¶m,
+ (u8 *)¶m,
4)!= 0)
{
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("BMIReadMemory for enabletimerwar failed \n"));
@@ -1448,7 +1448,7 @@ ar6000_configure_target(AR_SOFTC_T *ar)
if (BMIWriteMemory(ar->arHifDevice,
HOST_INTEREST_ITEM_ADDRESS(ar, hi_option_flag),
- (A_UCHAR *)¶m,
+ (u8 *)¶m,
4) != 0)
{
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("BMIWriteMemory for enabletimerwar failed \n"));
@@ -1463,7 +1463,7 @@ ar6000_configure_target(AR_SOFTC_T *ar)
if (BMIReadMemory(ar->arHifDevice,
HOST_INTEREST_ITEM_ADDRESS(ar, hi_option_flag),
- (A_UCHAR *)¶m,
+ (u8 *)¶m,
4)!= 0)
{
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("BMIReadMemory for setting fwmode failed \n"));
@@ -1474,7 +1474,7 @@ ar6000_configure_target(AR_SOFTC_T *ar)
if (BMIWriteMemory(ar->arHifDevice,
HOST_INTEREST_ITEM_ADDRESS(ar, hi_option_flag),
- (A_UCHAR *)¶m,
+ (u8 *)¶m,
4) != 0)
{
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("BMIWriteMemory for setting fwmode failed \n"));
@@ -1489,7 +1489,7 @@ ar6000_configure_target(AR_SOFTC_T *ar)
if (BMIReadMemory(ar->arHifDevice,
HOST_INTEREST_ITEM_ADDRESS(ar, hi_option_flag),
- (A_UCHAR *)¶m,
+ (u8 *)¶m,
4)!= 0)
{
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("BMIReadMemory for disabling debug logs failed\n"));
@@ -1500,7 +1500,7 @@ ar6000_configure_target(AR_SOFTC_T *ar)
if (BMIWriteMemory(ar->arHifDevice,
HOST_INTEREST_ITEM_ADDRESS(ar, hi_option_flag),
- (A_UCHAR *)¶m,
+ (u8 *)¶m,
4) != 0)
{
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("BMIWriteMemory for HI_OPTION_DISABLE_DBGLOG\n"));
@@ -1522,7 +1522,7 @@ ar6000_configure_target(AR_SOFTC_T *ar)
param = AR6003_BOARD_EXT_DATA_ADDRESS;
if (BMIWriteMemory(ar->arHifDevice,
HOST_INTEREST_ITEM_ADDRESS(ar, hi_board_ext_data),
- (A_UCHAR *)¶m,
+ (u8 *)¶m,
4) != 0)
{
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("BMIWriteMemory for hi_board_ext_data failed \n"));
diff --git a/drivers/staging/ath6kl/os/linux/eeprom.c b/drivers/staging/ath6kl/os/linux/eeprom.c
index 7d7a63d..7d049df 100644
--- a/drivers/staging/ath6kl/os/linux/eeprom.c
+++ b/drivers/staging/ath6kl/os/linux/eeprom.c
@@ -53,7 +53,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;
@@ -143,14 +143,14 @@ BMI_write_reg(u32 address, u32 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 f3b7344..0beba09 100644
--- a/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
+++ b/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
@@ -553,7 +553,7 @@ typedef struct ar6_softc {
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 32bd29b..8cb5632 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;
diff --git a/drivers/staging/ath6kl/os/linux/ioctl.c b/drivers/staging/ath6kl/os/linux/ioctl.c
index a95b743..1824475 100644
--- a/drivers/staging/ath6kl/os/linux/ioctl.c
+++ b/drivers/staging/ath6kl/os/linux/ioctl.c
@@ -702,8 +702,8 @@ ar6000_ioctl_tcmd_get_rx_report(struct net_device *dev,
buf[1] = ar->tcmdRxRssi;
buf[2] = ar->tcmdRxcrcErrPkt;
buf[3] = ar->tcmdRxsecErrPkt;
- memcpy(((A_UCHAR *)buf)+(4*sizeof(u32)), ar->tcmdRateCnt, sizeof(ar->tcmdRateCnt));
- memcpy(((A_UCHAR *)buf)+(4*sizeof(u32))+(TCMD_MAX_RATES *sizeof(u16)), ar->tcmdRateCntShortGuard, sizeof(ar->tcmdRateCntShortGuard));
+ memcpy(((u8 *)buf)+(4*sizeof(u32)), ar->tcmdRateCnt, sizeof(ar->tcmdRateCnt));
+ memcpy(((u8 *)buf)+(4*sizeof(u32))+(TCMD_MAX_RATES *sizeof(u16)), ar->tcmdRateCntShortGuard, sizeof(ar->tcmdRateCntShortGuard));
if (!ret && copy_to_user(rq->ifr_data, buf, sizeof(buf))) {
ret = -EFAULT;
diff --git a/drivers/staging/ath6kl/wlan/src/wlan_node.c b/drivers/staging/ath6kl/wlan/src/wlan_node.c
index 0edf9c1..83c4dc3 100644
--- a/drivers/staging/ath6kl/wlan/src/wlan_node.c
+++ b/drivers/staging/ath6kl/wlan/src/wlan_node.c
@@ -432,11 +432,11 @@ wlan_node_table_cleanup(struct ieee80211_node_table *nt)
}
bss_t *
-wlan_find_Ssidnode (struct ieee80211_node_table *nt, A_UCHAR *pSsid,
+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);
@@ -554,13 +554,13 @@ wlan_node_remove(struct ieee80211_node_table *nt, u8 *bssid)
}
bss_t *
-wlan_find_matching_Ssidnode (struct ieee80211_node_table *nt, A_UCHAR *pSsid,
+wlan_find_matching_Ssidnode (struct ieee80211_node_table *nt, 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 bf9dd0b..80ba629 100644
--- a/drivers/staging/ath6kl/wmi/wmi.c
+++ b/drivers/staging/ath6kl/wmi/wmi.c
@@ -1421,8 +1421,8 @@ 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)) {
@@ -1477,7 +1477,7 @@ wmi_bssInfo_event_rx(struct wmi_t *wmip, u8 *datap, int len)
* 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) && (ie_ssid[2] != 0))
@@ -2420,7 +2420,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;
@@ -2616,7 +2616,7 @@ 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;
@@ -4844,7 +4844,7 @@ wmi_set_wmm_txop(struct wmi_t *wmip, WMI_TXOP_CFG cfg)
}
int
-wmi_set_country(struct wmi_t *wmip, A_UCHAR *countryCode)
+wmi_set_country(struct wmi_t *wmip, u8 *countryCode)
{
void *osbuf;
WMI_AP_SET_COUNTRY_CMD *cmd;
@@ -5374,7 +5374,7 @@ wmi_set_nodeage(struct wmi_t *wmip, u32 nodeAge)
}
bss_t *
-wmi_find_Ssidnode (struct wmi_t *wmip, A_UCHAR *pSsid,
+wmi_find_Ssidnode (struct wmi_t *wmip, u8 *pSsid,
u32 ssidLength, bool bIsWPA2, bool bMatchSSID)
{
bss_t *node = NULL;
@@ -6652,7 +6652,7 @@ wmi_SGI_cmd(struct wmi_t *wmip, u32 sgiMask, u8 sgiPERThreshold)
}
bss_t *
-wmi_find_matching_Ssidnode (struct wmi_t *wmip, A_UCHAR *pSsid,
+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
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 05/20] ath6kl: remove-typedef AGGR_INFO
2011-03-11 2:55 [PATCH 00/20] ath6kl: first series of cleanups Luis R. Rodriguez
` (3 preceding siblings ...)
2011-03-11 2:55 ` [PATCH 04/20] ath6kl: remove-typedef: A_UCHAR Luis R. Rodriguez
@ 2011-03-11 2:55 ` Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 06/20] ath6kl: remove-typedef AR3K_CONFIG_INFO Luis R. Rodriguez
` (15 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Luis R. Rodriguez @ 2011-03-11 2:55 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-wireless, vmehta, naveen.singh, Luis R. Rodriguez
remove-typedef -s AGGR_INFO \
"struct aggr_info" drivers/staging/ath6kl/
Cc: Naveen Singh <naveen.singh@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/staging/ath6kl/reorder/aggr_rx_internal.h | 4 +-
drivers/staging/ath6kl/reorder/rcv_aggr.c | 42 ++++++++++----------
2 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/drivers/staging/ath6kl/reorder/aggr_rx_internal.h b/drivers/staging/ath6kl/reorder/aggr_rx_internal.h
index 523a239..20c894d 100644
--- a/drivers/staging/ath6kl/reorder/aggr_rx_internal.h
+++ b/drivers/staging/ath6kl/reorder/aggr_rx_internal.h
@@ -100,7 +100,7 @@ typedef struct {
u32 num_bar; /* num of resets of seq_num, via BAR */
}RXTID_STATS;
-typedef struct {
+struct aggr_info {
u8 aggr_sz; /* config value of aggregation size */
u8 timerScheduled;
A_TIMER timer; /* timer for returning held up pkts in re-order que */
@@ -111,6 +111,6 @@ typedef struct {
A_NETBUF_QUEUE_T freeQ; /* pre-allocated buffers - for A_MSDU slicing */
RXTID_STATS stat[NUM_OF_TIDS]; /* Tid based statistics */
PACKET_LOG pkt_log; /* Log info of the packets */
-}AGGR_INFO;
+};
#endif /* __AGGR_RX_INTERNAL_H__ */
diff --git a/drivers/staging/ath6kl/reorder/rcv_aggr.c b/drivers/staging/ath6kl/reorder/rcv_aggr.c
index adb85eb..8beb00d 100644
--- a/drivers/staging/ath6kl/reorder/rcv_aggr.c
+++ b/drivers/staging/ath6kl/reorder/rcv_aggr.c
@@ -37,24 +37,24 @@ extern int
wmi_dot3_2_dix(void *osbuf);
static void
-aggr_slice_amsdu(AGGR_INFO *p_aggr, RXTID *rxtid, void **osbuf);
+aggr_slice_amsdu(struct aggr_info *p_aggr, RXTID *rxtid, void **osbuf);
static void
aggr_timeout(A_ATH_TIMER arg);
static void
-aggr_deque_frms(AGGR_INFO *p_aggr, u8 tid, u16 seq_no, u8 order);
+aggr_deque_frms(struct aggr_info *p_aggr, u8 tid, u16 seq_no, u8 order);
static void
-aggr_dispatch_frames(AGGR_INFO *p_aggr, A_NETBUF_QUEUE_T *q);
+aggr_dispatch_frames(struct aggr_info *p_aggr, A_NETBUF_QUEUE_T *q);
static void *
-aggr_get_osbuf(AGGR_INFO *p_aggr);
+aggr_get_osbuf(struct aggr_info *p_aggr);
void *
aggr_init(ALLOC_NETBUFS netbuf_allocator)
{
- AGGR_INFO *p_aggr = NULL;
+ struct aggr_info *p_aggr = NULL;
RXTID *rxtid;
u8 i;
int status = 0;
@@ -62,7 +62,7 @@ aggr_init(ALLOC_NETBUFS netbuf_allocator)
A_PRINTF("In aggr_init..\n");
do {
- p_aggr = A_MALLOC(sizeof(AGGR_INFO));
+ p_aggr = A_MALLOC(sizeof(struct aggr_info));
if(!p_aggr) {
A_PRINTF("Failed to allocate memory for aggr_node\n");
status = A_ERROR;
@@ -70,7 +70,7 @@ aggr_init(ALLOC_NETBUFS netbuf_allocator)
}
/* Init timer and data structures */
- A_MEMZERO(p_aggr, sizeof(AGGR_INFO));
+ A_MEMZERO(p_aggr, sizeof(struct aggr_info));
p_aggr->aggr_sz = AGGR_SZ_DEFAULT;
A_INIT_TIMER(&p_aggr->timer, aggr_timeout, p_aggr);
p_aggr->timerScheduled = false;
@@ -101,7 +101,7 @@ aggr_init(ALLOC_NETBUFS netbuf_allocator)
/* utility function to clear rx hold_q for a tid */
static void
-aggr_delete_tid_state(AGGR_INFO *p_aggr, u8 tid)
+aggr_delete_tid_state(struct aggr_info *p_aggr, u8 tid)
{
RXTID *rxtid;
RXTID_STATS *stats;
@@ -133,7 +133,7 @@ aggr_delete_tid_state(AGGR_INFO *p_aggr, u8 tid)
void
aggr_module_destroy(void *cntxt)
{
- AGGR_INFO *p_aggr = (AGGR_INFO *)cntxt;
+ struct aggr_info *p_aggr = (struct aggr_info *)cntxt;
RXTID *rxtid;
u8 i, k;
A_PRINTF("%s(): aggr = %p\n",_A_FUNCNAME_, p_aggr);
@@ -177,7 +177,7 @@ aggr_module_destroy(void *cntxt)
void
aggr_register_rx_dispatcher(void *cntxt, void * dev, RX_CALLBACK fn)
{
- AGGR_INFO *p_aggr = (AGGR_INFO *)cntxt;
+ struct aggr_info *p_aggr = (struct aggr_info *)cntxt;
A_ASSERT(p_aggr && fn && dev);
@@ -189,7 +189,7 @@ aggr_register_rx_dispatcher(void *cntxt, void * dev, RX_CALLBACK fn)
void
aggr_process_bar(void *cntxt, u8 tid, u16 seq_no)
{
- AGGR_INFO *p_aggr = (AGGR_INFO *)cntxt;
+ struct aggr_info *p_aggr = (struct aggr_info *)cntxt;
RXTID_STATS *stats;
A_ASSERT(p_aggr);
@@ -203,7 +203,7 @@ aggr_process_bar(void *cntxt, u8 tid, u16 seq_no)
void
aggr_recv_addba_req_evt(void *cntxt, u8 tid, u16 seq_no, u8 win_sz)
{
- AGGR_INFO *p_aggr = (AGGR_INFO *)cntxt;
+ struct aggr_info *p_aggr = (struct aggr_info *)cntxt;
RXTID *rxtid;
RXTID_STATS *stats;
@@ -255,7 +255,7 @@ aggr_recv_addba_req_evt(void *cntxt, u8 tid, u16 seq_no, u8 win_sz)
void
aggr_recv_delba_req_evt(void *cntxt, u8 tid)
{
- AGGR_INFO *p_aggr = (AGGR_INFO *)cntxt;
+ struct aggr_info *p_aggr = (struct aggr_info *)cntxt;
RXTID *rxtid;
A_ASSERT(p_aggr);
@@ -269,7 +269,7 @@ aggr_recv_delba_req_evt(void *cntxt, u8 tid)
}
static void
-aggr_deque_frms(AGGR_INFO *p_aggr, u8 tid, u16 seq_no, u8 order)
+aggr_deque_frms(struct aggr_info *p_aggr, u8 tid, u16 seq_no, u8 order)
{
RXTID *rxtid;
OSBUF_HOLD_Q *node;
@@ -334,7 +334,7 @@ aggr_deque_frms(AGGR_INFO *p_aggr, u8 tid, u16 seq_no, u8 order)
}
static void *
-aggr_get_osbuf(AGGR_INFO *p_aggr)
+aggr_get_osbuf(struct aggr_info *p_aggr)
{
void *buf = NULL;
@@ -356,7 +356,7 @@ aggr_get_osbuf(AGGR_INFO *p_aggr)
static void
-aggr_slice_amsdu(AGGR_INFO *p_aggr, RXTID *rxtid, void **osbuf)
+aggr_slice_amsdu(struct aggr_info *p_aggr, RXTID *rxtid, void **osbuf)
{
void *new_buf;
u16 frame_8023_len, payload_8023_len, mac_hdr_len, amsdu_len;
@@ -428,7 +428,7 @@ aggr_slice_amsdu(AGGR_INFO *p_aggr, RXTID *rxtid, void **osbuf)
void
aggr_process_recv_frm(void *cntxt, u8 tid, u16 seq_no, bool is_amsdu, void **osbuf)
{
- AGGR_INFO *p_aggr = (AGGR_INFO *)cntxt;
+ struct aggr_info *p_aggr = (struct aggr_info *)cntxt;
RXTID *rxtid;
RXTID_STATS *stats;
u16 idx, st, cur, end;
@@ -562,7 +562,7 @@ void
aggr_reset_state(void *cntxt)
{
u8 tid;
- AGGR_INFO *p_aggr = (AGGR_INFO *)cntxt;
+ struct aggr_info *p_aggr = (struct aggr_info *)cntxt;
A_ASSERT(p_aggr);
@@ -576,7 +576,7 @@ static void
aggr_timeout(A_ATH_TIMER arg)
{
u8 i,j;
- AGGR_INFO *p_aggr = (AGGR_INFO *)arg;
+ struct aggr_info *p_aggr = (struct aggr_info *)arg;
RXTID *rxtid;
RXTID_STATS *stats;
/*
@@ -630,7 +630,7 @@ aggr_timeout(A_ATH_TIMER arg)
}
static void
-aggr_dispatch_frames(AGGR_INFO *p_aggr, A_NETBUF_QUEUE_T *q)
+aggr_dispatch_frames(struct aggr_info *p_aggr, A_NETBUF_QUEUE_T *q)
{
void *osbuf;
@@ -642,7 +642,7 @@ aggr_dispatch_frames(AGGR_INFO *p_aggr, A_NETBUF_QUEUE_T *q)
void
aggr_dump_stats(void *cntxt, PACKET_LOG **log_buf)
{
- AGGR_INFO *p_aggr = (AGGR_INFO *)cntxt;
+ struct aggr_info *p_aggr = (struct aggr_info *)cntxt;
RXTID *rxtid;
RXTID_STATS *stats;
u8 i;
--
1.7.4.15.g7811d
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 06/20] ath6kl: remove-typedef AR3K_CONFIG_INFO
2011-03-11 2:55 [PATCH 00/20] ath6kl: first series of cleanups Luis R. Rodriguez
` (4 preceding siblings ...)
2011-03-11 2:55 ` [PATCH 05/20] ath6kl: remove-typedef AGGR_INFO Luis R. Rodriguez
@ 2011-03-11 2:55 ` Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 07/20] ath6kl: remove-typedef AR6000_USER_SETKEYS_INFO Luis R. Rodriguez
` (14 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Luis R. Rodriguez @ 2011-03-11 2:55 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-wireless, vmehta, naveen.singh, Luis R. Rodriguez
remove-typedef -s AR3K_CONFIG_INFO \
"struct ar3k_config_info" drivers/staging/ath6kl/
Cc: Naveen Singh <naveen.singh@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/staging/ath6kl/include/ar3kconfig.h | 6 ++--
drivers/staging/ath6kl/miscdrv/ar3kconfig.c | 20 +++++++++---------
.../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c | 22 ++++++++++----------
.../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h | 4 +-
drivers/staging/ath6kl/os/linux/ar6000_drv.c | 2 +-
drivers/staging/ath6kl/os/linux/hci_bridge.c | 6 ++--
6 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/drivers/staging/ath6kl/include/ar3kconfig.h b/drivers/staging/ath6kl/include/ar3kconfig.h
index 4d73201..20d295b 100644
--- a/drivers/staging/ath6kl/include/ar3kconfig.h
+++ b/drivers/staging/ath6kl/include/ar3kconfig.h
@@ -38,7 +38,7 @@ extern "C" {
#define AR3K_CONFIG_FLAG_SET_AR6K_SCALE_STEP (1 << 3)
-typedef struct {
+struct ar3k_config_info {
u32 Flags; /* config flags */
void *pHCIDev; /* HCI bridge device */
HCI_TRANSPORT_PROPERTIES *pHCIProps; /* HCI bridge props */
@@ -52,9 +52,9 @@ typedef struct {
u16 IdleTimeout; /* TLPM idle timeout */
u16 WakeupTimeout; /* TLPM wakeup timeout */
u8 bdaddr[6]; /* Bluetooth device address */
-} AR3K_CONFIG_INFO;
+};
-int AR3KConfigure(AR3K_CONFIG_INFO *pConfigInfo);
+int AR3KConfigure(struct ar3k_config_info *pConfigInfo);
int AR3KConfigureExit(void *config);
diff --git a/drivers/staging/ath6kl/miscdrv/ar3kconfig.c b/drivers/staging/ath6kl/miscdrv/ar3kconfig.c
index 005b3ba..3e9c95e 100644
--- a/drivers/staging/ath6kl/miscdrv/ar3kconfig.c
+++ b/drivers/staging/ath6kl/miscdrv/ar3kconfig.c
@@ -47,9 +47,9 @@
#define HCI_MAX_EVT_RECV_LENGTH 257
#define EXIT_MIN_BOOT_COMMAND_STATUS_OFFSET 5
-int AthPSInitialize(AR3K_CONFIG_INFO *hdev);
+int AthPSInitialize(struct ar3k_config_info *hdev);
-static int SendHCICommand(AR3K_CONFIG_INFO *pConfig,
+static int SendHCICommand(struct ar3k_config_info *pConfig,
u8 *pBuffer,
int Length)
{
@@ -84,7 +84,7 @@ static int SendHCICommand(AR3K_CONFIG_INFO *pConfig,
return status;
}
-static int RecvHCIEvent(AR3K_CONFIG_INFO *pConfig,
+static int RecvHCIEvent(struct ar3k_config_info *pConfig,
u8 *pBuffer,
int *pLength)
{
@@ -122,7 +122,7 @@ static int RecvHCIEvent(AR3K_CONFIG_INFO *pConfig,
return status;
}
-int SendHCICommandWaitCommandComplete(AR3K_CONFIG_INFO *pConfig,
+int SendHCICommandWaitCommandComplete(struct ar3k_config_info *pConfig,
u8 *pHCICommand,
int CmdLength,
u8 **ppEventBuffer,
@@ -209,7 +209,7 @@ int SendHCICommandWaitCommandComplete(AR3K_CONFIG_INFO *pConfig,
return status;
}
-static int AR3KConfigureHCIBaud(AR3K_CONFIG_INFO *pConfig)
+static int AR3KConfigureHCIBaud(struct ar3k_config_info *pConfig)
{
int status = 0;
u8 hciBaudChangeCommand[] = {0x0c,0xfc,0x2,0,0};
@@ -274,7 +274,7 @@ static int AR3KConfigureHCIBaud(AR3K_CONFIG_INFO *pConfig)
return status;
}
-static int AR3KExitMinBoot(AR3K_CONFIG_INFO *pConfig)
+static int AR3KExitMinBoot(struct ar3k_config_info *pConfig)
{
int status;
char exitMinBootCmd[] = {0x25,0xFC,0x0c,0x03,0x00,0x00,0x00,0x00,0x00,0x00,
@@ -310,7 +310,7 @@ static int AR3KExitMinBoot(AR3K_CONFIG_INFO *pConfig)
return status;
}
-static int AR3KConfigureSendHCIReset(AR3K_CONFIG_INFO *pConfig)
+static int AR3KConfigureSendHCIReset(struct ar3k_config_info *pConfig)
{
int status = 0;
u8 hciResetCommand[] = {0x03,0x0c,0x0};
@@ -334,7 +334,7 @@ static int AR3KConfigureSendHCIReset(AR3K_CONFIG_INFO *pConfig)
return status;
}
-static int AR3KEnableTLPM(AR3K_CONFIG_INFO *pConfig)
+static int AR3KEnableTLPM(struct ar3k_config_info *pConfig)
{
int status;
/* AR3K vendor specific command for Host Wakeup Config */
@@ -453,7 +453,7 @@ static int AR3KEnableTLPM(AR3K_CONFIG_INFO *pConfig)
return status;
}
-int AR3KConfigure(AR3K_CONFIG_INFO *pConfig)
+int AR3KConfigure(struct ar3k_config_info *pConfig)
{
int status = 0;
@@ -524,7 +524,7 @@ int AR3KConfigure(AR3K_CONFIG_INFO *pConfig)
int AR3KConfigureExit(void *config)
{
int status = 0;
- AR3K_CONFIG_INFO *pConfig = (AR3K_CONFIG_INFO *)config;
+ struct ar3k_config_info *pConfig = (struct ar3k_config_info *)config;
AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("AR3K Config: Cleaning up AR3K ...\n"));
diff --git a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
index 3dce6f5..3436cbd 100644
--- a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
+++ b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
@@ -43,10 +43,10 @@ typedef struct {
PSCmdPacket *HciCmdList;
u32 num_packets;
- AR3K_CONFIG_INFO *dev;
+ struct ar3k_config_info *dev;
}HciCommandListParam;
-int SendHCICommandWaitCommandComplete(AR3K_CONFIG_INFO *pConfig,
+int SendHCICommandWaitCommandComplete(struct ar3k_config_info *pConfig,
u8 *pHCICommand,
int CmdLength,
u8 **ppEventBuffer,
@@ -56,8 +56,8 @@ u32 Rom_Version;
u32 Build_Version;
extern bool BDADDR;
-int getDeviceType(AR3K_CONFIG_INFO *pConfig, u32 *code);
-int ReadVersionInfo(AR3K_CONFIG_INFO *pConfig);
+int getDeviceType(struct ar3k_config_info *pConfig, u32 *code);
+int ReadVersionInfo(struct ar3k_config_info *pConfig);
#ifndef HCI_TRANSPORT_SDIO
DECLARE_WAIT_QUEUE_HEAD(PsCompleteEvent);
@@ -70,7 +70,7 @@ int PSHciWritepacket(struct hci_dev*,u8* Data, u32 len);
extern char *bdaddr;
#endif /* HCI_TRANSPORT_SDIO */
-int write_bdaddr(AR3K_CONFIG_INFO *pConfig,u8 *bdaddr,int type);
+int write_bdaddr(struct ar3k_config_info *pConfig,u8 *bdaddr,int type);
int PSSendOps(void *arg);
@@ -91,7 +91,7 @@ void Hci_log(u8 * log_string,u8 *data,u32 len)
-int AthPSInitialize(AR3K_CONFIG_INFO *hdev)
+int AthPSInitialize(struct ar3k_config_info *hdev)
{
int status = 0;
if(hdev == NULL) {
@@ -147,7 +147,7 @@ int PSSendOps(void *arg)
u8 *path = NULL;
u8 *config_path = NULL;
u8 config_bdaddr[MAX_BDADDR_FORMAT_LENGTH];
- AR3K_CONFIG_INFO *hdev = (AR3K_CONFIG_INFO*)arg;
+ struct ar3k_config_info *hdev = (struct ar3k_config_info*)arg;
struct device *firmwareDev = NULL;
status = 0;
HciCmdList = NULL;
@@ -389,7 +389,7 @@ complete:
* with a HCI Command Complete event.
* For HCI SDIO transport, this will be internally defined.
*/
-int SendHCICommandWaitCommandComplete(AR3K_CONFIG_INFO *pConfig,
+int SendHCICommandWaitCommandComplete(struct ar3k_config_info *pConfig,
u8 *pHCICommand,
int CmdLength,
u8 **ppEventBuffer,
@@ -481,7 +481,7 @@ int str2ba(unsigned char *str_bdaddr,unsigned char *bdaddr)
return 0;
}
-int write_bdaddr(AR3K_CONFIG_INFO *pConfig,u8 *bdaddr,int type)
+int write_bdaddr(struct ar3k_config_info *pConfig,u8 *bdaddr,int type)
{
u8 bdaddr_cmd[] = { 0x0B, 0xFC, 0x0A, 0x01, 0x01,
0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
@@ -516,7 +516,7 @@ int write_bdaddr(AR3K_CONFIG_INFO *pConfig,u8 *bdaddr,int type)
return result;
}
-int ReadVersionInfo(AR3K_CONFIG_INFO *pConfig)
+int ReadVersionInfo(struct ar3k_config_info *pConfig)
{
u8 hciCommand[] = {0x1E,0xfc,0x00};
u8 *event;
@@ -531,7 +531,7 @@ int ReadVersionInfo(AR3K_CONFIG_INFO *pConfig)
}
return result;
}
-int getDeviceType(AR3K_CONFIG_INFO *pConfig, u32 *code)
+int getDeviceType(struct ar3k_config_info *pConfig, u32 *code)
{
u8 hciCommand[] = {0x05,0xfc,0x05,0x00,0x00,0x00,0x00,0x04};
u8 *event;
diff --git a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h
index b97d91f..d443513 100644
--- a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h
+++ b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h
@@ -64,12 +64,12 @@
#ifndef HCI_TRANSPORT_SDIO
-#define AR3K_CONFIG_INFO struct hci_dev
+#define struct ar3k_config_info struct hci_dev
extern wait_queue_head_t HciEvent;
extern wait_queue_t Eventwait;
extern u8 *HciEventpacket;
#endif /* #ifndef HCI_TRANSPORT_SDIO */
-int AthPSInitialize(AR3K_CONFIG_INFO *hdev);
+int AthPSInitialize(struct ar3k_config_info *hdev);
int ReadPSEvent(u8* Data);
#endif /* __AR3KPSCONFIG_H */
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
index f8d8999..3397995 100644
--- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c
+++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
@@ -2011,7 +2011,7 @@ ar6000_stop_endpoint(struct net_device *dev, bool keepprofile, bool getdbglogs)
#else
// FIXME: workaround to reset BT's UART baud rate to default
if (NULL != ar->exitCallback) {
- AR3K_CONFIG_INFO ar3kconfig;
+ struct ar3k_config_info ar3kconfig;
int status;
A_MEMZERO(&ar3kconfig,sizeof(ar3kconfig));
diff --git a/drivers/staging/ath6kl/os/linux/hci_bridge.c b/drivers/staging/ath6kl/os/linux/hci_bridge.c
index db38bbf..ee52d11 100644
--- a/drivers/staging/ath6kl/os/linux/hci_bridge.c
+++ b/drivers/staging/ath6kl/os/linux/hci_bridge.c
@@ -100,7 +100,7 @@ typedef struct {
#define HCI_GET_OP_CODE(p) (((u16)((p)[1])) << 8) | ((u16)((p)[0]))
extern unsigned int setupbtdev;
-AR3K_CONFIG_INFO ar3kconfig;
+struct ar3k_config_info ar3kconfig;
#ifdef EXPORT_HCI_BRIDGE_INTERFACE
AR6K_HCI_BRIDGE_INFO *g_pHcidevInfo;
@@ -222,7 +222,7 @@ static int ar6000_hci_transport_ready(HCI_TRANSPORT_HANDLE HCIHandle,
AR6K_HCI_BRIDGE_INFO *pHcidevInfo = (AR6K_HCI_BRIDGE_INFO *)pContext;
int status;
u32 address, hci_uart_pwr_mgmt_params;
-// AR3K_CONFIG_INFO ar3kconfig;
+// struct ar3k_config_info ar3kconfig;
pHcidevInfo->pHCIDev = HCIHandle;
@@ -667,7 +667,7 @@ int hci_test_send(AR_SOFTC_T *ar, struct sk_buff *skb)
void ar6000_set_default_ar3kconfig(AR_SOFTC_T *ar, void *ar3kconfig)
{
AR6K_HCI_BRIDGE_INFO *pHcidevInfo = (AR6K_HCI_BRIDGE_INFO *)ar->hcidev_info;
- AR3K_CONFIG_INFO *config = (AR3K_CONFIG_INFO *)ar3kconfig;
+ struct ar3k_config_info *config = (struct ar3k_config_info *)ar3kconfig;
config->pHCIDev = pHcidevInfo->pHCIDev;
config->pHCIProps = &pHcidevInfo->HCIProps;
--
1.7.4.15.g7811d
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 07/20] ath6kl: remove-typedef AR6000_USER_SETKEYS_INFO
2011-03-11 2:55 [PATCH 00/20] ath6kl: first series of cleanups Luis R. Rodriguez
` (5 preceding siblings ...)
2011-03-11 2:55 ` [PATCH 06/20] ath6kl: remove-typedef AR3K_CONFIG_INFO Luis R. Rodriguez
@ 2011-03-11 2:55 ` Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 08/20] ath6kl: remove-typedef AR6K_ASYNC_REG_IO_BUFFER Luis R. Rodriguez
` (13 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Luis R. Rodriguez @ 2011-03-11 2:55 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-wireless, vmehta, naveen.singh, Luis R. Rodriguez
remove-typedef -s AR6000_USER_SETKEYS_INFO \
"struct ar6000_user_setkeys_info" drivers/staging/ath6kl/
Cc: Naveen Singh <naveen.singh@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
.../staging/ath6kl/os/linux/include/athdrv_linux.h | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/ath6kl/os/linux/include/athdrv_linux.h b/drivers/staging/ath6kl/os/linux/include/athdrv_linux.h
index 5a6c27e..66817c2 100644
--- a/drivers/staging/ath6kl/os/linux/include/athdrv_linux.h
+++ b/drivers/staging/ath6kl/os/linux/include/athdrv_linux.h
@@ -625,7 +625,7 @@ typedef enum {
* arguments:
* UINT32 cmd (AR6000_XIOCTL_USER_SETKEYS)
* UINT32 keyOpCtrl
- * uses AR6000_USER_SETKEYS_INFO
+ * uses struct ar6000_user_setkeys_info
*/
#define AR6000_XIOCTL_USER_SETKEYS 58
#endif /* USER_KEYS */
@@ -1098,10 +1098,9 @@ typedef struct targetStats_cmd_t {
#define AR6000_XIOCTL_USER_SETKEYS_RSC_CTRL 1
#define AR6000_USER_SETKEYS_RSC_UNCHANGED 0x00000002
-typedef struct {
+struct ar6000_user_setkeys_info {
u32 keyOpCtrl; /* Bit Map of Key Mgmt Ctrl Flags */
-} AR6000_USER_SETKEYS_INFO;
-
+}; /* XXX: unused !? */
/* used by AR6000_XIOCTL_GPIO_OUTPUT_SET */
struct ar6000_gpio_output_set_cmd_s {
--
1.7.4.15.g7811d
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 08/20] ath6kl: remove-typedef AR6K_ASYNC_REG_IO_BUFFER
2011-03-11 2:55 [PATCH 00/20] ath6kl: first series of cleanups Luis R. Rodriguez
` (6 preceding siblings ...)
2011-03-11 2:55 ` [PATCH 07/20] ath6kl: remove-typedef AR6000_USER_SETKEYS_INFO Luis R. Rodriguez
@ 2011-03-11 2:55 ` Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 09/20] ath6kl: remove-typedef AR6K_DEVICE Luis R. Rodriguez
` (12 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Luis R. Rodriguez @ 2011-03-11 2:55 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-wireless, vmehta, naveen.singh, Luis R. Rodriguez
remove-typedef -s AR6K_ASYNC_REG_IO_BUFFER \
"struct ar6k_async_reg_io_buffer" drivers/staging/ath6kl/
Cc: Naveen Singh <naveen.singh@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/staging/ath6kl/htc2/AR6000/ar6k.h | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k.h b/drivers/staging/ath6kl/htc2/AR6000/ar6k.h
index 19d8e70..e0c3926 100644
--- a/drivers/staging/ath6kl/htc2/AR6000/ar6k.h
+++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k.h
@@ -89,12 +89,12 @@ typedef PREPACK struct _AR6K_GMBOX_CTRL_REGISTERS {
#define AR6K_MIN_TRANSFER_SIZE_PER_SCATTER 4*1024
/* buffers for ASYNC I/O */
-typedef struct AR6K_ASYNC_REG_IO_BUFFER {
+struct ar6k_async_reg_io_buffer {
HTC_PACKET HtcPacket; /* we use an HTC packet as a wrapper for our async register-based I/O */
u8 _Pad1[A_CACHE_LINE_PAD];
u8 Buffer[AR6K_REG_IO_BUFFER_SIZE]; /* cache-line safe with pads around */
u8 _Pad2[A_CACHE_LINE_PAD];
-} AR6K_ASYNC_REG_IO_BUFFER;
+};
typedef struct _AR6K_GMBOX_INFO {
void *pProtocolContext;
@@ -119,7 +119,7 @@ typedef struct _AR6K_DEVICE {
HIF_PENDING_EVENTS_FUNC GetPendingEventsFunc;
void *HTCContext;
HTC_PACKET_QUEUE RegisterIOList;
- AR6K_ASYNC_REG_IO_BUFFER RegIOBuffers[AR6K_MAX_REG_IO_BUFFERS];
+ struct ar6k_async_reg_io_buffer RegIOBuffers[AR6K_MAX_REG_IO_BUFFERS];
void (*TargetFailureCallback)(void *Context);
int (*MessagePendingCallback)(void *Context,
u32 LookAheads[],
--
1.7.4.15.g7811d
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 09/20] ath6kl: remove-typedef AR6K_DEVICE
2011-03-11 2:55 [PATCH 00/20] ath6kl: first series of cleanups Luis R. Rodriguez
` (7 preceding siblings ...)
2011-03-11 2:55 ` [PATCH 08/20] ath6kl: remove-typedef AR6K_ASYNC_REG_IO_BUFFER Luis R. Rodriguez
@ 2011-03-11 2:55 ` Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 10/20] ath6kl: remove-typedef AR6K_GMBOX_CTRL_REGISTERS Luis R. Rodriguez
` (11 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Luis R. Rodriguez @ 2011-03-11 2:55 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-wireless, vmehta, naveen.singh, Luis R. Rodriguez
remove-typedef -s AR6K_DEVICE \
"struct ar6k_device" drivers/staging/ath6kl/
Cc: Naveen Singh <naveen.singh@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/staging/ath6kl/htc2/AR6000/ar6k.c | 64 +++++++++---------
drivers/staging/ath6kl/htc2/AR6000/ar6k.h | 74 ++++++++++----------
drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c | 28 ++++----
drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c | 32 ++++----
.../ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c | 10 ++--
drivers/staging/ath6kl/htc2/htc.c | 2 +-
drivers/staging/ath6kl/htc2/htc_internal.h | 2 +-
7 files changed, 106 insertions(+), 106 deletions(-)
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k.c b/drivers/staging/ath6kl/htc2/AR6000/ar6k.c
index 9090a39..85d45a7 100644
--- a/drivers/staging/ath6kl/htc2/AR6000/ar6k.c
+++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k.c
@@ -35,19 +35,19 @@
#define MAILBOX_FOR_BLOCK_SIZE 1
-int DevEnableInterrupts(AR6K_DEVICE *pDev);
-int DevDisableInterrupts(AR6K_DEVICE *pDev);
+int DevEnableInterrupts(struct ar6k_device *pDev);
+int DevDisableInterrupts(struct ar6k_device *pDev);
-static void DevCleanupVirtualScatterSupport(AR6K_DEVICE *pDev);
+static void DevCleanupVirtualScatterSupport(struct ar6k_device *pDev);
-void AR6KFreeIOPacket(AR6K_DEVICE *pDev, HTC_PACKET *pPacket)
+void AR6KFreeIOPacket(struct ar6k_device *pDev, HTC_PACKET *pPacket)
{
LOCK_AR6K(pDev);
HTC_PACKET_ENQUEUE(&pDev->RegisterIOList,pPacket);
UNLOCK_AR6K(pDev);
}
-HTC_PACKET *AR6KAllocIOPacket(AR6K_DEVICE *pDev)
+HTC_PACKET *AR6KAllocIOPacket(struct ar6k_device *pDev)
{
HTC_PACKET *pPacket;
@@ -58,7 +58,7 @@ HTC_PACKET *AR6KAllocIOPacket(AR6K_DEVICE *pDev)
return pPacket;
}
-void DevCleanup(AR6K_DEVICE *pDev)
+void DevCleanup(struct ar6k_device *pDev)
{
DevCleanupGMbox(pDev);
@@ -74,7 +74,7 @@ void DevCleanup(AR6K_DEVICE *pDev)
}
}
-int DevSetup(AR6K_DEVICE *pDev)
+int DevSetup(struct ar6k_device *pDev)
{
u32 blocksizes[AR6K_MAILBOXES];
int status = 0;
@@ -216,7 +216,7 @@ int DevSetup(AR6K_DEVICE *pDev)
}
-int DevEnableInterrupts(AR6K_DEVICE *pDev)
+int DevEnableInterrupts(struct ar6k_device *pDev)
{
int status;
AR6K_IRQ_ENABLE_REGISTERS regs;
@@ -276,7 +276,7 @@ int DevEnableInterrupts(AR6K_DEVICE *pDev)
return status;
}
-int DevDisableInterrupts(AR6K_DEVICE *pDev)
+int DevDisableInterrupts(struct ar6k_device *pDev)
{
AR6K_IRQ_ENABLE_REGISTERS regs;
@@ -301,7 +301,7 @@ int DevDisableInterrupts(AR6K_DEVICE *pDev)
}
/* enable device interrupts */
-int DevUnmaskInterrupts(AR6K_DEVICE *pDev)
+int DevUnmaskInterrupts(struct ar6k_device *pDev)
{
/* for good measure, make sure interrupt are disabled before unmasking at the HIF
* layer.
@@ -327,7 +327,7 @@ int DevUnmaskInterrupts(AR6K_DEVICE *pDev)
}
/* disable all device interrupts */
-int DevMaskInterrupts(AR6K_DEVICE *pDev)
+int DevMaskInterrupts(struct ar6k_device *pDev)
{
/* mask the interrupt at the HIF layer, we don't want a stray interrupt taken while
* we zero out our shadow registers in DevDisableInterrupts()*/
@@ -339,7 +339,7 @@ int DevMaskInterrupts(AR6K_DEVICE *pDev)
/* callback when our fetch to enable/disable completes */
static void DevDoEnableDisableRecvAsyncHandler(void *Context, HTC_PACKET *pPacket)
{
- AR6K_DEVICE *pDev = (AR6K_DEVICE *)Context;
+ struct ar6k_device *pDev = (struct ar6k_device *)Context;
AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("+DevDoEnableDisableRecvAsyncHandler: (dev: 0x%lX)\n", (unsigned long)pDev));
@@ -355,7 +355,7 @@ static void DevDoEnableDisableRecvAsyncHandler(void *Context, HTC_PACKET *pPacke
/* disable packet reception (used in case the host runs out of buffers)
* this is the "override" method when the HIF reports another methods to
* disable recv events */
-static int DevDoEnableDisableRecvOverride(AR6K_DEVICE *pDev, bool EnableRecv, bool AsyncMode)
+static int DevDoEnableDisableRecvOverride(struct ar6k_device *pDev, bool EnableRecv, bool AsyncMode)
{
int status = 0;
HTC_PACKET *pIOPacket = NULL;
@@ -403,7 +403,7 @@ static int DevDoEnableDisableRecvOverride(AR6K_DEVICE *pDev, bool EnableRecv, bo
/* disable packet reception (used in case the host runs out of buffers)
* this is the "normal" method using the interrupt enable registers through
* the host I/F */
-static int DevDoEnableDisableRecvNormal(AR6K_DEVICE *pDev, bool EnableRecv, bool AsyncMode)
+static int DevDoEnableDisableRecvNormal(struct ar6k_device *pDev, bool EnableRecv, bool AsyncMode)
{
int status = 0;
HTC_PACKET *pIOPacket = NULL;
@@ -470,7 +470,7 @@ static int DevDoEnableDisableRecvNormal(AR6K_DEVICE *pDev, bool EnableRecv, bool
}
-int DevStopRecv(AR6K_DEVICE *pDev, bool AsyncMode)
+int DevStopRecv(struct ar6k_device *pDev, bool AsyncMode)
{
if (NULL == pDev->HifMaskUmaskRecvEvent) {
return DevDoEnableDisableRecvNormal(pDev,false,AsyncMode);
@@ -479,7 +479,7 @@ int DevStopRecv(AR6K_DEVICE *pDev, bool AsyncMode)
}
}
-int DevEnableRecv(AR6K_DEVICE *pDev, bool AsyncMode)
+int DevEnableRecv(struct ar6k_device *pDev, bool AsyncMode)
{
if (NULL == pDev->HifMaskUmaskRecvEvent) {
return DevDoEnableDisableRecvNormal(pDev,true,AsyncMode);
@@ -488,7 +488,7 @@ int DevEnableRecv(AR6K_DEVICE *pDev, bool AsyncMode)
}
}
-int DevWaitForPendingRecv(AR6K_DEVICE *pDev,u32 TimeoutInMs,bool *pbIsRecvPending)
+int DevWaitForPendingRecv(struct ar6k_device *pDev,u32 TimeoutInMs,bool *pbIsRecvPending)
{
int status = 0;
u8 host_int_status = 0x0;
@@ -536,7 +536,7 @@ int DevWaitForPendingRecv(AR6K_DEVICE *pDev,u32 TimeoutInMs,bool *pbIsRecvPendin
return status;
}
-void DevDumpRegisters(AR6K_DEVICE *pDev,
+void DevDumpRegisters(struct ar6k_device *pDev,
AR6K_IRQ_PROC_REGISTERS *pIrqProcRegs,
AR6K_IRQ_ENABLE_REGISTERS *pIrqEnableRegs)
{
@@ -590,7 +590,7 @@ void DevDumpRegisters(AR6K_DEVICE *pDev,
static HIF_SCATTER_REQ *DevAllocScatterReq(HIF_DEVICE *Context)
{
DL_LIST *pItem;
- AR6K_DEVICE *pDev = (AR6K_DEVICE *)Context;
+ struct ar6k_device *pDev = (struct ar6k_device *)Context;
LOCK_AR6K(pDev);
pItem = DL_ListRemoveItemFromHead(&pDev->ScatterReqHead);
UNLOCK_AR6K(pDev);
@@ -602,7 +602,7 @@ static HIF_SCATTER_REQ *DevAllocScatterReq(HIF_DEVICE *Context)
static void DevFreeScatterReq(HIF_DEVICE *Context, HIF_SCATTER_REQ *pReq)
{
- AR6K_DEVICE *pDev = (AR6K_DEVICE *)Context;
+ struct ar6k_device *pDev = (struct ar6k_device *)Context;
LOCK_AR6K(pDev);
DL_ListInsertTail(&pDev->ScatterReqHead, &pReq->ListLink);
UNLOCK_AR6K(pDev);
@@ -650,7 +650,7 @@ int DevCopyScatterListToFromDMABuffer(HIF_SCATTER_REQ *pReq, bool FromDMA)
static void DevReadWriteScatterAsyncHandler(void *Context, HTC_PACKET *pPacket)
{
- AR6K_DEVICE *pDev = (AR6K_DEVICE *)Context;
+ struct ar6k_device *pDev = (struct ar6k_device *)Context;
HIF_SCATTER_REQ *pReq = (HIF_SCATTER_REQ *)pPacket->pPktContext;
AR_DEBUG_PRINTF(ATH_DEBUG_RECV,("+DevReadWriteScatterAsyncHandler: (dev: 0x%lX)\n", (unsigned long)pDev));
@@ -666,7 +666,7 @@ static void DevReadWriteScatterAsyncHandler(void *Context, HTC_PACKET *pPacket)
static int DevReadWriteScatter(HIF_DEVICE *Context, HIF_SCATTER_REQ *pReq)
{
- AR6K_DEVICE *pDev = (AR6K_DEVICE *)Context;
+ struct ar6k_device *pDev = (struct ar6k_device *)Context;
int status = 0;
HTC_PACKET *pIOPacket = NULL;
u32 request = pReq->Request;
@@ -734,7 +734,7 @@ static int DevReadWriteScatter(HIF_DEVICE *Context, HIF_SCATTER_REQ *pReq)
}
-static void DevCleanupVirtualScatterSupport(AR6K_DEVICE *pDev)
+static void DevCleanupVirtualScatterSupport(struct ar6k_device *pDev)
{
HIF_SCATTER_REQ *pReq;
@@ -749,7 +749,7 @@ static void DevCleanupVirtualScatterSupport(AR6K_DEVICE *pDev)
}
/* function to set up virtual scatter support if HIF layer has not implemented the interface */
-static int DevSetupVirtualScatterSupport(AR6K_DEVICE *pDev)
+static int DevSetupVirtualScatterSupport(struct ar6k_device *pDev)
{
int status = 0;
int bufferSize, sgreqSize;
@@ -810,7 +810,7 @@ static int DevSetupVirtualScatterSupport(AR6K_DEVICE *pDev)
return status;
}
-int DevCleanupMsgBundling(AR6K_DEVICE *pDev)
+int DevCleanupMsgBundling(struct ar6k_device *pDev)
{
if(NULL != pDev)
{
@@ -820,7 +820,7 @@ int DevCleanupMsgBundling(AR6K_DEVICE *pDev)
return 0;
}
-int DevSetupMsgBundling(AR6K_DEVICE *pDev, int MaxMsgsPerTransfer)
+int DevSetupMsgBundling(struct ar6k_device *pDev, int MaxMsgsPerTransfer)
{
int status;
@@ -885,7 +885,7 @@ int DevSetupMsgBundling(AR6K_DEVICE *pDev, int MaxMsgsPerTransfer)
return status;
}
-int DevSubmitScatterRequest(AR6K_DEVICE *pDev, HIF_SCATTER_REQ *pScatterReq, bool Read, bool Async)
+int DevSubmitScatterRequest(struct ar6k_device *pDev, HIF_SCATTER_REQ *pScatterReq, bool Read, bool Async)
{
int status;
@@ -1134,7 +1134,7 @@ static u16 GetEndMarker(void)
#define ATH_PRINT_OUT_ZONE ATH_DEBUG_ERR
/* send the ordered buffers to the target */
-static int SendBuffers(AR6K_DEVICE *pDev, int mbox)
+static int SendBuffers(struct ar6k_device *pDev, int mbox)
{
int status = 0;
u32 request = HIF_WR_SYNC_BLOCK_INC;
@@ -1178,7 +1178,7 @@ static int SendBuffers(AR6K_DEVICE *pDev, int mbox)
}
/* poll the mailbox credit counter until we get a credit or timeout */
-static int GetCredits(AR6K_DEVICE *pDev, int mbox, int *pCredits)
+static int GetCredits(struct ar6k_device *pDev, int mbox, int *pCredits)
{
int status = 0;
int timeout = TEST_CREDITS_RECV_TIMEOUT;
@@ -1225,7 +1225,7 @@ static int GetCredits(AR6K_DEVICE *pDev, int mbox, int *pCredits)
/* wait for the buffers to come back */
-static int RecvBuffers(AR6K_DEVICE *pDev, int mbox)
+static int RecvBuffers(struct ar6k_device *pDev, int mbox)
{
int status = 0;
u32 request = HIF_RD_SYNC_BLOCK_INC;
@@ -1303,7 +1303,7 @@ static int RecvBuffers(AR6K_DEVICE *pDev, int mbox)
}
-static int DoOneMboxHWTest(AR6K_DEVICE *pDev, int mbox)
+static int DoOneMboxHWTest(struct ar6k_device *pDev, int mbox)
{
int status;
@@ -1339,7 +1339,7 @@ static int DoOneMboxHWTest(AR6K_DEVICE *pDev, int mbox)
}
/* here is where the test starts */
-int DoMboxHWTest(AR6K_DEVICE *pDev)
+int DoMboxHWTest(struct ar6k_device *pDev)
{
int i;
int status;
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k.h b/drivers/staging/ath6kl/htc2/AR6000/ar6k.h
index e0c3926..ebcc82b 100644
--- a/drivers/staging/ath6kl/htc2/AR6000/ar6k.h
+++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k.h
@@ -105,7 +105,7 @@ typedef struct _AR6K_GMBOX_INFO {
bool CreditCountIRQEnabled;
} AR6K_GMBOX_INFO;
-typedef struct _AR6K_DEVICE {
+struct ar6k_device {
A_MUTEX_T Lock;
u8 _Pad1[A_CACHE_LINE_PAD];
AR6K_IRQ_PROC_REGISTERS IrqProcRegisters; /* cache-line safe with pads around */
@@ -141,24 +141,24 @@ typedef struct _AR6K_DEVICE {
bool GMboxEnabled;
AR6K_GMBOX_CTRL_REGISTERS GMboxControlRegisters;
int RecheckIRQStatusCnt;
-} AR6K_DEVICE;
+};
#define LOCK_AR6K(p) A_MUTEX_LOCK(&(p)->Lock);
#define UNLOCK_AR6K(p) A_MUTEX_UNLOCK(&(p)->Lock);
#define REF_IRQ_STATUS_RECHECK(p) (p)->RecheckIRQStatusCnt = 1 /* note: no need to lock this, it only gets set */
-int DevSetup(AR6K_DEVICE *pDev);
-void DevCleanup(AR6K_DEVICE *pDev);
-int DevUnmaskInterrupts(AR6K_DEVICE *pDev);
-int DevMaskInterrupts(AR6K_DEVICE *pDev);
-int DevPollMboxMsgRecv(AR6K_DEVICE *pDev,
+int DevSetup(struct ar6k_device *pDev);
+void DevCleanup(struct ar6k_device *pDev);
+int DevUnmaskInterrupts(struct ar6k_device *pDev);
+int DevMaskInterrupts(struct ar6k_device *pDev);
+int DevPollMboxMsgRecv(struct ar6k_device *pDev,
u32 *pLookAhead,
int TimeoutMS);
int DevRWCompletionHandler(void *context, int status);
int DevDsrHandler(void *context);
int DevCheckPendingRecvMsgsAsync(void *context);
-void DevAsyncIrqProcessComplete(AR6K_DEVICE *pDev);
-void DevDumpRegisters(AR6K_DEVICE *pDev,
+void DevAsyncIrqProcessComplete(struct ar6k_device *pDev);
+void DevDumpRegisters(struct ar6k_device *pDev,
AR6K_IRQ_PROC_REGISTERS *pIrqProcRegs,
AR6K_IRQ_ENABLE_REGISTERS *pIrqEnableRegs);
@@ -166,17 +166,17 @@ void DevDumpRegisters(AR6K_DEVICE *pDev,
#define DEV_STOP_RECV_SYNC false
#define DEV_ENABLE_RECV_ASYNC true
#define DEV_ENABLE_RECV_SYNC false
-int DevStopRecv(AR6K_DEVICE *pDev, bool ASyncMode);
-int DevEnableRecv(AR6K_DEVICE *pDev, bool ASyncMode);
-int DevEnableInterrupts(AR6K_DEVICE *pDev);
-int DevDisableInterrupts(AR6K_DEVICE *pDev);
-int DevWaitForPendingRecv(AR6K_DEVICE *pDev,u32 TimeoutInMs,bool *pbIsRecvPending);
+int DevStopRecv(struct ar6k_device *pDev, bool ASyncMode);
+int DevEnableRecv(struct ar6k_device *pDev, bool ASyncMode);
+int DevEnableInterrupts(struct ar6k_device *pDev);
+int DevDisableInterrupts(struct ar6k_device *pDev);
+int DevWaitForPendingRecv(struct ar6k_device *pDev,u32 TimeoutInMs,bool *pbIsRecvPending);
#define DEV_CALC_RECV_PADDED_LEN(pDev, length) (((length) + (pDev)->BlockMask) & (~((pDev)->BlockMask)))
#define DEV_CALC_SEND_PADDED_LEN(pDev, length) DEV_CALC_RECV_PADDED_LEN(pDev,length)
#define DEV_IS_LEN_BLOCK_ALIGNED(pDev, length) (((length) % (pDev)->BlockSize) == 0)
-static INLINE int DevSendPacket(AR6K_DEVICE *pDev, HTC_PACKET *pPacket, u32 SendLength) {
+static INLINE int DevSendPacket(struct ar6k_device *pDev, HTC_PACKET *pPacket, u32 SendLength) {
u32 paddedLength;
bool sync = (pPacket->Completion == NULL) ? true : false;
int status;
@@ -219,7 +219,7 @@ static INLINE int DevSendPacket(AR6K_DEVICE *pDev, HTC_PACKET *pPacket, u32 Send
return status;
}
-static INLINE int DevRecvPacket(AR6K_DEVICE *pDev, HTC_PACKET *pPacket, u32 RecvLength) {
+static INLINE int DevRecvPacket(struct ar6k_device *pDev, HTC_PACKET *pPacket, u32 RecvLength) {
u32 paddedLength;
int status;
bool sync = (pPacket->Completion == NULL) ? true : false;
@@ -296,9 +296,9 @@ static INLINE int DEV_PREPARE_SCATTER_OPERATION(HIF_SCATTER_REQ *pReq) {
}
-int DevSetupMsgBundling(AR6K_DEVICE *pDev, int MaxMsgsPerTransfer);
+int DevSetupMsgBundling(struct ar6k_device *pDev, int MaxMsgsPerTransfer);
-int DevCleanupMsgBundling(AR6K_DEVICE *pDev);
+int DevCleanupMsgBundling(struct ar6k_device *pDev);
#define DEV_GET_MAX_MSG_PER_BUNDLE(pDev) (pDev)->HifScatterInfo.MaxScatterEntries
#define DEV_GET_MAX_BUNDLE_LENGTH(pDev) (pDev)->HifScatterInfo.MaxTransferSizePerScatterReq
@@ -315,10 +315,10 @@ int DevCleanupMsgBundling(AR6K_DEVICE *pDev);
#define DEV_SCATTER_WRITE false
#define DEV_SCATTER_ASYNC true
#define DEV_SCATTER_SYNC false
-int DevSubmitScatterRequest(AR6K_DEVICE *pDev, HIF_SCATTER_REQ *pScatterReq, bool Read, bool Async);
+int DevSubmitScatterRequest(struct ar6k_device *pDev, HIF_SCATTER_REQ *pScatterReq, bool Read, bool Async);
#ifdef MBOXHW_UNIT_TEST
-int DoMboxHWTest(AR6K_DEVICE *pDev);
+int DoMboxHWTest(struct ar6k_device *pDev);
#endif
/* completely virtual */
@@ -329,7 +329,7 @@ typedef struct _DEV_SCATTER_DMA_VIRTUAL_INFO {
-void DumpAR6KDevState(AR6K_DEVICE *pDev);
+void DumpAR6KDevState(struct ar6k_device *pDev);
/**************************************************/
/****** GMBOX functions and definitions
@@ -339,10 +339,10 @@ void DumpAR6KDevState(AR6K_DEVICE *pDev);
#ifdef ATH_AR6K_ENABLE_GMBOX
-void DevCleanupGMbox(AR6K_DEVICE *pDev);
-int DevSetupGMbox(AR6K_DEVICE *pDev);
-int DevCheckGMboxInterrupts(AR6K_DEVICE *pDev);
-void DevNotifyGMboxTargetFailure(AR6K_DEVICE *pDev);
+void DevCleanupGMbox(struct ar6k_device *pDev);
+int DevSetupGMbox(struct ar6k_device *pDev);
+int DevCheckGMboxInterrupts(struct ar6k_device *pDev);
+void DevNotifyGMboxTargetFailure(struct ar6k_device *pDev);
#else
@@ -351,7 +351,7 @@ void DevNotifyGMboxTargetFailure(AR6K_DEVICE *pDev);
#define DevCheckGMboxInterrupts(p) 0
#define DevNotifyGMboxTargetFailure(p)
-static INLINE int DevSetupGMbox(AR6K_DEVICE *pDev) {
+static INLINE int DevSetupGMbox(struct ar6k_device *pDev) {
pDev->GMboxEnabled = false;
return 0;
}
@@ -361,12 +361,12 @@ static INLINE int DevSetupGMbox(AR6K_DEVICE *pDev) {
#ifdef ATH_AR6K_ENABLE_GMBOX
/* GMBOX protocol modules must expose each of these internal APIs */
-HCI_TRANSPORT_HANDLE GMboxAttachProtocol(AR6K_DEVICE *pDev, HCI_TRANSPORT_CONFIG_INFO *pInfo);
-int GMboxProtocolInstall(AR6K_DEVICE *pDev);
-void GMboxProtocolUninstall(AR6K_DEVICE *pDev);
+HCI_TRANSPORT_HANDLE GMboxAttachProtocol(struct ar6k_device *pDev, HCI_TRANSPORT_CONFIG_INFO *pInfo);
+int GMboxProtocolInstall(struct ar6k_device *pDev);
+void GMboxProtocolUninstall(struct ar6k_device *pDev);
/* API used by GMBOX protocol modules */
-AR6K_DEVICE *HTCGetAR6KDevice(void *HTCHandle);
+struct ar6k_device *HTCGetAR6KDevice(void *HTCHandle);
#define DEV_GMBOX_SET_PROTOCOL(pDev,recv_callback,credits_pending,failure,statedump,context) \
{ \
(pDev)->GMboxInfo.pProtocolContext = (context); \
@@ -378,8 +378,8 @@ AR6K_DEVICE *HTCGetAR6KDevice(void *HTCHandle);
#define DEV_GMBOX_GET_PROTOCOL(pDev) (pDev)->GMboxInfo.pProtocolContext
-int DevGMboxWrite(AR6K_DEVICE *pDev, HTC_PACKET *pPacket, u32 WriteLength);
-int DevGMboxRead(AR6K_DEVICE *pDev, HTC_PACKET *pPacket, u32 ReadLength);
+int DevGMboxWrite(struct ar6k_device *pDev, HTC_PACKET *pPacket, u32 WriteLength);
+int DevGMboxRead(struct ar6k_device *pDev, HTC_PACKET *pPacket, u32 ReadLength);
#define PROC_IO_ASYNC true
#define PROC_IO_SYNC false
@@ -393,11 +393,11 @@ typedef enum GMBOX_IRQ_ACTION_TYPE {
GMBOX_CREDIT_IRQ_DISABLE,
} GMBOX_IRQ_ACTION_TYPE;
-int DevGMboxIRQAction(AR6K_DEVICE *pDev, GMBOX_IRQ_ACTION_TYPE, bool AsyncMode);
-int DevGMboxReadCreditCounter(AR6K_DEVICE *pDev, bool AsyncMode, int *pCredits);
-int DevGMboxReadCreditSize(AR6K_DEVICE *pDev, int *pCreditSize);
-int DevGMboxRecvLookAheadPeek(AR6K_DEVICE *pDev, u8 *pLookAheadBuffer, int *pLookAheadBytes);
-int DevGMboxSetTargetInterrupt(AR6K_DEVICE *pDev, int SignalNumber, int AckTimeoutMS);
+int DevGMboxIRQAction(struct ar6k_device *pDev, GMBOX_IRQ_ACTION_TYPE, bool AsyncMode);
+int DevGMboxReadCreditCounter(struct ar6k_device *pDev, bool AsyncMode, int *pCredits);
+int DevGMboxReadCreditSize(struct ar6k_device *pDev, int *pCreditSize);
+int DevGMboxRecvLookAheadPeek(struct ar6k_device *pDev, u8 *pLookAheadBuffer, int *pLookAheadBytes);
+int DevGMboxSetTargetInterrupt(struct ar6k_device *pDev, int SignalNumber, int AckTimeoutMS);
#endif
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c b/drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
index bee4850..aa45590 100644
--- a/drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
+++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
@@ -33,10 +33,10 @@
#include "htc_packet.h"
#include "ar6k.h"
-extern void AR6KFreeIOPacket(AR6K_DEVICE *pDev, HTC_PACKET *pPacket);
-extern HTC_PACKET *AR6KAllocIOPacket(AR6K_DEVICE *pDev);
+extern void AR6KFreeIOPacket(struct ar6k_device *pDev, HTC_PACKET *pPacket);
+extern HTC_PACKET *AR6KAllocIOPacket(struct ar6k_device *pDev);
-static int DevServiceDebugInterrupt(AR6K_DEVICE *pDev);
+static int DevServiceDebugInterrupt(struct ar6k_device *pDev);
#define DELAY_PER_INTERVAL_MS 10 /* 10 MS delay per polling interval */
@@ -59,7 +59,7 @@ int DevRWCompletionHandler(void *context, int status)
}
/* mailbox recv message polling */
-int DevPollMboxMsgRecv(AR6K_DEVICE *pDev,
+int DevPollMboxMsgRecv(struct ar6k_device *pDev,
u32 *pLookAhead,
int TimeoutMS)
{
@@ -152,7 +152,7 @@ int DevPollMboxMsgRecv(AR6K_DEVICE *pDev,
return status;
}
-static int DevServiceCPUInterrupt(AR6K_DEVICE *pDev)
+static int DevServiceCPUInterrupt(struct ar6k_device *pDev)
{
int status;
u8 cpu_int_status;
@@ -192,7 +192,7 @@ static int DevServiceCPUInterrupt(AR6K_DEVICE *pDev)
}
-static int DevServiceErrorInterrupt(AR6K_DEVICE *pDev)
+static int DevServiceErrorInterrupt(struct ar6k_device *pDev)
{
int status;
u8 error_int_status;
@@ -245,7 +245,7 @@ static int DevServiceErrorInterrupt(AR6K_DEVICE *pDev)
return status;
}
-static int DevServiceDebugInterrupt(AR6K_DEVICE *pDev)
+static int DevServiceDebugInterrupt(struct ar6k_device *pDev)
{
u32 dummy;
int status;
@@ -275,7 +275,7 @@ static int DevServiceDebugInterrupt(AR6K_DEVICE *pDev)
return status;
}
-static int DevServiceCounterInterrupt(AR6K_DEVICE *pDev)
+static int DevServiceCounterInterrupt(struct ar6k_device *pDev)
{
u8 counter_int_status;
@@ -302,7 +302,7 @@ static int DevServiceCounterInterrupt(AR6K_DEVICE *pDev)
/* callback when our fetch to get interrupt status registers completes */
static void DevGetEventAsyncHandler(void *Context, HTC_PACKET *pPacket)
{
- AR6K_DEVICE *pDev = (AR6K_DEVICE *)Context;
+ struct ar6k_device *pDev = (struct ar6k_device *)Context;
u32 lookAhead = 0;
bool otherInts = false;
@@ -390,7 +390,7 @@ static void DevGetEventAsyncHandler(void *Context, HTC_PACKET *pPacket)
* recv messages, this starts off a series of async requests to read interrupt registers */
int DevCheckPendingRecvMsgsAsync(void *context)
{
- AR6K_DEVICE *pDev = (AR6K_DEVICE *)context;
+ struct ar6k_device *pDev = (struct ar6k_device *)context;
int status = 0;
HTC_PACKET *pIOPacket;
@@ -460,14 +460,14 @@ int DevCheckPendingRecvMsgsAsync(void *context)
return status;
}
-void DevAsyncIrqProcessComplete(AR6K_DEVICE *pDev)
+void DevAsyncIrqProcessComplete(struct ar6k_device *pDev)
{
AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("DevAsyncIrqProcessComplete - forcing HIF IRQ ACK \n"));
HIFAckInterrupt(pDev->HIFDevice);
}
/* process pending interrupts synchronously */
-static int ProcessPendingIRQs(AR6K_DEVICE *pDev, bool *pDone, bool *pASyncProcessing)
+static int ProcessPendingIRQs(struct ar6k_device *pDev, bool *pDone, bool *pASyncProcessing)
{
int status = 0;
u8 host_int_status = 0;
@@ -683,7 +683,7 @@ static int ProcessPendingIRQs(AR6K_DEVICE *pDev, bool *pDone, bool *pASyncProces
/* Synchronousinterrupt handler, this handler kicks off all interrupt processing.*/
int DevDsrHandler(void *context)
{
- AR6K_DEVICE *pDev = (AR6K_DEVICE *)context;
+ struct ar6k_device *pDev = (struct ar6k_device *)context;
int status = 0;
bool done = false;
bool asyncProc = false;
@@ -744,7 +744,7 @@ int DevDsrHandler(void *context)
}
#ifdef ATH_DEBUG_MODULE
-void DumpAR6KDevState(AR6K_DEVICE *pDev)
+void DumpAR6KDevState(struct ar6k_device *pDev)
{
int status;
AR6K_IRQ_ENABLE_REGISTERS regs;
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c b/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c
index 46bcb27..cbfbdea 100644
--- a/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c
+++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c
@@ -54,14 +54,14 @@
/* external APIs for allocating and freeing internal I/O packets to handle ASYNC I/O */
-extern void AR6KFreeIOPacket(AR6K_DEVICE *pDev, HTC_PACKET *pPacket);
-extern HTC_PACKET *AR6KAllocIOPacket(AR6K_DEVICE *pDev);
+extern void AR6KFreeIOPacket(struct ar6k_device *pDev, HTC_PACKET *pPacket);
+extern HTC_PACKET *AR6KAllocIOPacket(struct ar6k_device *pDev);
/* callback when our fetch to enable/disable completes */
static void DevGMboxIRQActionAsyncHandler(void *Context, HTC_PACKET *pPacket)
{
- AR6K_DEVICE *pDev = (AR6K_DEVICE *)Context;
+ struct ar6k_device *pDev = (struct ar6k_device *)Context;
AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("+DevGMboxIRQActionAsyncHandler: (dev: 0x%lX)\n", (unsigned long)pDev));
@@ -74,7 +74,7 @@ static void DevGMboxIRQActionAsyncHandler(void *Context, HTC_PACKET *pPacket)
AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("-DevGMboxIRQActionAsyncHandler \n"));
}
-static int DevGMboxCounterEnableDisable(AR6K_DEVICE *pDev, GMBOX_IRQ_ACTION_TYPE IrqAction, bool AsyncMode)
+static int DevGMboxCounterEnableDisable(struct ar6k_device *pDev, GMBOX_IRQ_ACTION_TYPE IrqAction, bool AsyncMode)
{
int status = 0;
AR6K_IRQ_ENABLE_REGISTERS regs;
@@ -155,7 +155,7 @@ static int DevGMboxCounterEnableDisable(AR6K_DEVICE *pDev, GMBOX_IRQ_ACTION_TYPE
}
-int DevGMboxIRQAction(AR6K_DEVICE *pDev, GMBOX_IRQ_ACTION_TYPE IrqAction, bool AsyncMode)
+int DevGMboxIRQAction(struct ar6k_device *pDev, GMBOX_IRQ_ACTION_TYPE IrqAction, bool AsyncMode)
{
int status = 0;
HTC_PACKET *pIOPacket = NULL;
@@ -261,7 +261,7 @@ int DevGMboxIRQAction(AR6K_DEVICE *pDev, GMBOX_IRQ_ACTION_TYPE IrqAction, bool A
return status;
}
-void DevCleanupGMbox(AR6K_DEVICE *pDev)
+void DevCleanupGMbox(struct ar6k_device *pDev)
{
if (pDev->GMboxEnabled) {
pDev->GMboxEnabled = false;
@@ -269,7 +269,7 @@ void DevCleanupGMbox(AR6K_DEVICE *pDev)
}
}
-int DevSetupGMbox(AR6K_DEVICE *pDev)
+int DevSetupGMbox(struct ar6k_device *pDev)
{
int status = 0;
u8 muxControl[4];
@@ -322,7 +322,7 @@ int DevSetupGMbox(AR6K_DEVICE *pDev)
return status;
}
-int DevCheckGMboxInterrupts(AR6K_DEVICE *pDev)
+int DevCheckGMboxInterrupts(struct ar6k_device *pDev)
{
int status = 0;
u8 counter_int_status;
@@ -396,7 +396,7 @@ int DevCheckGMboxInterrupts(AR6K_DEVICE *pDev)
}
-int DevGMboxWrite(AR6K_DEVICE *pDev, HTC_PACKET *pPacket, u32 WriteLength)
+int DevGMboxWrite(struct ar6k_device *pDev, HTC_PACKET *pPacket, u32 WriteLength)
{
u32 paddedLength;
bool sync = (pPacket->Completion == NULL) ? true : false;
@@ -433,7 +433,7 @@ int DevGMboxWrite(AR6K_DEVICE *pDev, HTC_PACKET *pPacket, u32 WriteLength)
return status;
}
-int DevGMboxRead(AR6K_DEVICE *pDev, HTC_PACKET *pPacket, u32 ReadLength)
+int DevGMboxRead(struct ar6k_device *pDev, HTC_PACKET *pPacket, u32 ReadLength)
{
u32 paddedLength;
@@ -518,7 +518,7 @@ static int ProcessCreditCounterReadBuffer(u8 *pBuffer, int Length)
/* callback when our fetch to enable/disable completes */
static void DevGMboxReadCreditsAsyncHandler(void *Context, HTC_PACKET *pPacket)
{
- AR6K_DEVICE *pDev = (AR6K_DEVICE *)Context;
+ struct ar6k_device *pDev = (struct ar6k_device *)Context;
AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("+DevGMboxReadCreditsAsyncHandler: (dev: 0x%lX)\n", (unsigned long)pDev));
@@ -539,7 +539,7 @@ static void DevGMboxReadCreditsAsyncHandler(void *Context, HTC_PACKET *pPacket)
AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("-DevGMboxReadCreditsAsyncHandler \n"));
}
-int DevGMboxReadCreditCounter(AR6K_DEVICE *pDev, bool AsyncMode, int *pCredits)
+int DevGMboxReadCreditCounter(struct ar6k_device *pDev, bool AsyncMode, int *pCredits)
{
int status = 0;
HTC_PACKET *pIOPacket = NULL;
@@ -602,7 +602,7 @@ int DevGMboxReadCreditCounter(AR6K_DEVICE *pDev, bool AsyncMode, int *pCredits)
return status;
}
-int DevGMboxReadCreditSize(AR6K_DEVICE *pDev, int *pCreditSize)
+int DevGMboxReadCreditSize(struct ar6k_device *pDev, int *pCreditSize)
{
int status;
u8 buffer[4];
@@ -626,7 +626,7 @@ int DevGMboxReadCreditSize(AR6K_DEVICE *pDev, int *pCreditSize)
return status;
}
-void DevNotifyGMboxTargetFailure(AR6K_DEVICE *pDev)
+void DevNotifyGMboxTargetFailure(struct ar6k_device *pDev)
{
/* Target ASSERTED!!! */
if (pDev->GMboxInfo.pTargetFailureCallback != NULL) {
@@ -634,7 +634,7 @@ void DevNotifyGMboxTargetFailure(AR6K_DEVICE *pDev)
}
}
-int DevGMboxRecvLookAheadPeek(AR6K_DEVICE *pDev, u8 *pLookAheadBuffer, int *pLookAheadBytes)
+int DevGMboxRecvLookAheadPeek(struct ar6k_device *pDev, u8 *pLookAheadBuffer, int *pLookAheadBytes)
{
int status = 0;
@@ -676,7 +676,7 @@ int DevGMboxRecvLookAheadPeek(AR6K_DEVICE *pDev, u8 *pLookAheadBuffer, int *pLoo
return status;
}
-int DevGMboxSetTargetInterrupt(AR6K_DEVICE *pDev, int Signal, int AckTimeoutMS)
+int DevGMboxSetTargetInterrupt(struct ar6k_device *pDev, int Signal, int AckTimeoutMS)
{
int status = 0;
int i;
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c b/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c
index 177f04d..3ee3d40 100644
--- a/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c
+++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c
@@ -66,7 +66,7 @@ typedef struct {
HTC_PACKET_QUEUE SendQueue; /* write queue holding HCI Command and ACL packets */
HTC_PACKET_QUEUE HCIACLRecvBuffers; /* recv queue holding buffers for incomming ACL packets */
HTC_PACKET_QUEUE HCIEventBuffers; /* recv queue holding buffers for incomming event packets */
- AR6K_DEVICE *pDev;
+ struct ar6k_device *pDev;
A_MUTEX_T HCIRxLock;
A_MUTEX_T HCITxLock;
int CreditsMax;
@@ -846,7 +846,7 @@ static void FlushRecvBuffers(GMBOX_PROTO_HCI_UART *pProt)
/*** protocol module install entry point ***/
-int GMboxProtocolInstall(AR6K_DEVICE *pDev)
+int GMboxProtocolInstall(struct ar6k_device *pDev)
{
int status = 0;
GMBOX_PROTO_HCI_UART *pProtocol = NULL;
@@ -889,7 +889,7 @@ int GMboxProtocolInstall(AR6K_DEVICE *pDev)
}
/*** protocol module uninstall entry point ***/
-void GMboxProtocolUninstall(AR6K_DEVICE *pDev)
+void GMboxProtocolUninstall(struct ar6k_device *pDev)
{
GMBOX_PROTO_HCI_UART *pProtocol = (GMBOX_PROTO_HCI_UART *)DEV_GMBOX_GET_PROTOCOL(pDev);
@@ -939,7 +939,7 @@ static int NotifyTransportReady(GMBOX_PROTO_HCI_UART *pProt)
HCI_TRANSPORT_HANDLE HCI_TransportAttach(void *HTCHandle, HCI_TRANSPORT_CONFIG_INFO *pInfo)
{
GMBOX_PROTO_HCI_UART *pProtocol = NULL;
- AR6K_DEVICE *pDev;
+ struct ar6k_device *pDev;
AR_DEBUG_PRINTF(ATH_DEBUG_TRC,("+HCI_TransportAttach \n"));
@@ -984,7 +984,7 @@ HCI_TRANSPORT_HANDLE HCI_TransportAttach(void *HTCHandle, HCI_TRANSPORT_CONFIG_I
void HCI_TransportDetach(HCI_TRANSPORT_HANDLE HciTrans)
{
GMBOX_PROTO_HCI_UART *pProtocol = (GMBOX_PROTO_HCI_UART *)HciTrans;
- AR6K_DEVICE *pDev = pProtocol->pDev;
+ struct ar6k_device *pDev = pProtocol->pDev;
AR_DEBUG_PRINTF(ATH_DEBUG_TRC,("+HCI_TransportDetach \n"));
diff --git a/drivers/staging/ath6kl/htc2/htc.c b/drivers/staging/ath6kl/htc2/htc.c
index c200cfd..8bde7bf 100644
--- a/drivers/staging/ath6kl/htc2/htc.c
+++ b/drivers/staging/ath6kl/htc2/htc.c
@@ -573,7 +573,7 @@ bool HTCGetEndpointStatistics(HTC_HANDLE HTCHandle,
#endif
}
-AR6K_DEVICE *HTCGetAR6KDevice(void *HTCHandle)
+struct ar6k_device *HTCGetAR6KDevice(void *HTCHandle)
{
HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
return &target->Device;
diff --git a/drivers/staging/ath6kl/htc2/htc_internal.h b/drivers/staging/ath6kl/htc2/htc_internal.h
index 73f6ed9..8bc3162 100644
--- a/drivers/staging/ath6kl/htc2/htc_internal.h
+++ b/drivers/staging/ath6kl/htc2/htc_internal.h
@@ -122,7 +122,7 @@ typedef struct _HTC_TARGET {
A_MUTEX_T HTCLock;
A_MUTEX_T HTCRxLock;
A_MUTEX_T HTCTxLock;
- AR6K_DEVICE Device; /* AR6K - specific state */
+ struct ar6k_device Device; /* AR6K - specific state */
u32 OpStateFlags;
u32 RecvStateFlags;
HTC_ENDPOINT_ID EpWaitingForBuffers;
--
1.7.4.15.g7811d
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 10/20] ath6kl: remove-typedef AR6K_GMBOX_CTRL_REGISTERS
2011-03-11 2:55 [PATCH 00/20] ath6kl: first series of cleanups Luis R. Rodriguez
` (8 preceding siblings ...)
2011-03-11 2:55 ` [PATCH 09/20] ath6kl: remove-typedef AR6K_DEVICE Luis R. Rodriguez
@ 2011-03-11 2:55 ` Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 11/20] ath6kl: remove-typedef AR6K_GMBOX_INFO Luis R. Rodriguez
` (10 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Luis R. Rodriguez @ 2011-03-11 2:55 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-wireless, vmehta, naveen.singh, Luis R. Rodriguez
remove-typedef -s AR6K_GMBOX_CTRL_REGISTERS \
"struct ar6k_gmbox_ctrl_registers" drivers/staging/ath6k
Cc: Naveen Singh <naveen.singh@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/staging/ath6kl/htc2/AR6000/ar6k.h | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k.h b/drivers/staging/ath6kl/htc2/AR6000/ar6k.h
index ebcc82b..e8b638c 100644
--- a/drivers/staging/ath6kl/htc2/AR6000/ar6k.h
+++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k.h
@@ -65,9 +65,9 @@ typedef PREPACK struct _AR6K_IRQ_ENABLE_REGISTERS {
u8 counter_int_status_enable;
} POSTPACK AR6K_IRQ_ENABLE_REGISTERS;
-typedef PREPACK struct _AR6K_GMBOX_CTRL_REGISTERS {
+PREPACK struct ar6k_gmbox_ctrl_registers {
u8 int_status_enable;
-} POSTPACK AR6K_GMBOX_CTRL_REGISTERS;
+} POSTPACK;
#include "athendpack.h"
@@ -139,7 +139,7 @@ struct ar6k_device {
int MaxSendBundleSize;
AR6K_GMBOX_INFO GMboxInfo;
bool GMboxEnabled;
- AR6K_GMBOX_CTRL_REGISTERS GMboxControlRegisters;
+ struct ar6k_gmbox_ctrl_registers GMboxControlRegisters;
int RecheckIRQStatusCnt;
};
--
1.7.4.15.g7811d
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 11/20] ath6kl: remove-typedef AR6K_GMBOX_INFO
2011-03-11 2:55 [PATCH 00/20] ath6kl: first series of cleanups Luis R. Rodriguez
` (9 preceding siblings ...)
2011-03-11 2:55 ` [PATCH 10/20] ath6kl: remove-typedef AR6K_GMBOX_CTRL_REGISTERS Luis R. Rodriguez
@ 2011-03-11 2:55 ` Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 12/20] ath6kl: remove-typedef AR6K_HCI_BRIDGE_INFO Luis R. Rodriguez
` (9 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Luis R. Rodriguez @ 2011-03-11 2:55 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-wireless, vmehta, naveen.singh, Luis R. Rodriguez
remove-typedef -s AR6K_GMBOX_INFO \
"struct ar6k_gmbox_info" drivers/staging/ath6kl/
Cc: Naveen Singh <naveen.singh@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/staging/ath6kl/htc2/AR6000/ar6k.h | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k.h b/drivers/staging/ath6kl/htc2/AR6000/ar6k.h
index e8b638c..0bee46a 100644
--- a/drivers/staging/ath6kl/htc2/AR6000/ar6k.h
+++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k.h
@@ -96,14 +96,14 @@ struct ar6k_async_reg_io_buffer {
u8 _Pad2[A_CACHE_LINE_PAD];
};
-typedef struct _AR6K_GMBOX_INFO {
+struct ar6k_gmbox_info {
void *pProtocolContext;
int (*pMessagePendingCallBack)(void *pContext, u8 LookAheadBytes[], int ValidBytes);
int (*pCreditsPendingCallback)(void *pContext, int NumCredits, bool CreditIRQEnabled);
void (*pTargetFailureCallback)(void *pContext, int Status);
void (*pStateDumpCallback)(void *pContext);
bool CreditCountIRQEnabled;
-} AR6K_GMBOX_INFO;
+};
struct ar6k_device {
A_MUTEX_T Lock;
@@ -137,7 +137,7 @@ struct ar6k_device {
bool ScatterIsVirtual;
int MaxRecvBundleSize;
int MaxSendBundleSize;
- AR6K_GMBOX_INFO GMboxInfo;
+ struct ar6k_gmbox_info GMboxInfo;
bool GMboxEnabled;
struct ar6k_gmbox_ctrl_registers GMboxControlRegisters;
int RecheckIRQStatusCnt;
--
1.7.4.15.g7811d
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 12/20] ath6kl: remove-typedef AR6K_HCI_BRIDGE_INFO
2011-03-11 2:55 [PATCH 00/20] ath6kl: first series of cleanups Luis R. Rodriguez
` (10 preceding siblings ...)
2011-03-11 2:55 ` [PATCH 11/20] ath6kl: remove-typedef AR6K_GMBOX_INFO Luis R. Rodriguez
@ 2011-03-11 2:55 ` Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 13/20] ath6kl: remove-typedef AR6K_IRQ_ENABLE_REGISTERS Luis R. Rodriguez
` (8 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Luis R. Rodriguez @ 2011-03-11 2:55 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-wireless, vmehta, naveen.singh, Luis R. Rodriguez
remove-typedef -s AR6K_HCI_BRIDGE_INFO \
"struct ar6k_hci_bridge_info" drivers/staging/ath6kl/
Cc: Naveen Singh <naveen.singh@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/staging/ath6kl/os/linux/hci_bridge.c | 88 +++++++++++++-------------
1 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/drivers/staging/ath6kl/os/linux/hci_bridge.c b/drivers/staging/ath6kl/os/linux/hci_bridge.c
index ee52d11..a02827b 100644
--- a/drivers/staging/ath6kl/os/linux/hci_bridge.c
+++ b/drivers/staging/ath6kl/os/linux/hci_bridge.c
@@ -73,7 +73,7 @@ extern unsigned int hciuartscale;
extern unsigned int hciuartstep;
#endif /* EXPORT_HCI_BRIDGE_INTERFACE */
-typedef struct {
+struct ar6k_hci_bridge_info {
void *pHCIDev; /* HCI bridge device */
HCI_TRANSPORT_PROPERTIES HCIProps; /* HCI bridge props */
struct hci_dev *pBtStackHCIDev; /* BT Stack HCI dev */
@@ -87,7 +87,7 @@ typedef struct {
#else
AR_SOFTC_T *ar;
#endif /* EXPORT_HCI_BRIDGE_INTERFACE */
-} AR6K_HCI_BRIDGE_INFO;
+};
#define MAX_ACL_RECV_BUFS 16
#define MAX_EVT_RECV_BUFS 8
@@ -103,17 +103,17 @@ extern unsigned int setupbtdev;
struct ar3k_config_info ar3kconfig;
#ifdef EXPORT_HCI_BRIDGE_INTERFACE
-AR6K_HCI_BRIDGE_INFO *g_pHcidevInfo;
+struct ar6k_hci_bridge_info *g_pHcidevInfo;
#endif
-static int bt_setup_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo);
-static void bt_cleanup_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo);
-static int bt_register_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo);
-static bool bt_indicate_recv(AR6K_HCI_BRIDGE_INFO *pHcidevInfo,
+static int bt_setup_hci(struct ar6k_hci_bridge_info *pHcidevInfo);
+static void bt_cleanup_hci(struct ar6k_hci_bridge_info *pHcidevInfo);
+static int bt_register_hci(struct ar6k_hci_bridge_info *pHcidevInfo);
+static bool bt_indicate_recv(struct ar6k_hci_bridge_info *pHcidevInfo,
HCI_TRANSPORT_PACKET_TYPE Type,
struct sk_buff *skb);
-static struct sk_buff *bt_alloc_buffer(AR6K_HCI_BRIDGE_INFO *pHcidevInfo, int Length);
-static void bt_free_buffer(AR6K_HCI_BRIDGE_INFO *pHcidevInfo, struct sk_buff *skb);
+static struct sk_buff *bt_alloc_buffer(struct ar6k_hci_bridge_info *pHcidevInfo, int Length);
+static void bt_free_buffer(struct ar6k_hci_bridge_info *pHcidevInfo, struct sk_buff *skb);
#ifdef EXPORT_HCI_BRIDGE_INTERFACE
int ar6000_setup_hci(void *ar);
@@ -129,7 +129,7 @@ int hci_test_send(AR_SOFTC_T *ar, struct sk_buff *skb);
#define LOCK_BRIDGE(dev) spin_lock_bh(&(dev)->BridgeLock)
#define UNLOCK_BRIDGE(dev) spin_unlock_bh(&(dev)->BridgeLock)
-static inline void FreeBtOsBuf(AR6K_HCI_BRIDGE_INFO *pHcidevInfo, void *osbuf)
+static inline void FreeBtOsBuf(struct ar6k_hci_bridge_info *pHcidevInfo, void *osbuf)
{
if (pHcidevInfo->HciNormalMode) {
bt_free_buffer(pHcidevInfo, (struct sk_buff *)osbuf);
@@ -139,14 +139,14 @@ static inline void FreeBtOsBuf(AR6K_HCI_BRIDGE_INFO *pHcidevInfo, void *osbuf)
}
}
-static void FreeHTCStruct(AR6K_HCI_BRIDGE_INFO *pHcidevInfo, HTC_PACKET *pPacket)
+static void FreeHTCStruct(struct ar6k_hci_bridge_info *pHcidevInfo, HTC_PACKET *pPacket)
{
LOCK_BRIDGE(pHcidevInfo);
HTC_PACKET_ENQUEUE(&pHcidevInfo->HTCPacketStructHead,pPacket);
UNLOCK_BRIDGE(pHcidevInfo);
}
-static HTC_PACKET * AllocHTCStruct(AR6K_HCI_BRIDGE_INFO *pHcidevInfo)
+static HTC_PACKET * AllocHTCStruct(struct ar6k_hci_bridge_info *pHcidevInfo)
{
HTC_PACKET *pPacket = NULL;
LOCK_BRIDGE(pHcidevInfo);
@@ -157,7 +157,7 @@ static HTC_PACKET * AllocHTCStruct(AR6K_HCI_BRIDGE_INFO *pHcidevInfo)
#define BLOCK_ROUND_UP_PWR2(x, align) (((int) (x) + ((align)-1)) & ~((align)-1))
-static void RefillRecvBuffers(AR6K_HCI_BRIDGE_INFO *pHcidevInfo,
+static void RefillRecvBuffers(struct ar6k_hci_bridge_info *pHcidevInfo,
HCI_TRANSPORT_PACKET_TYPE Type,
int NumBuffers)
{
@@ -219,7 +219,7 @@ static int ar6000_hci_transport_ready(HCI_TRANSPORT_HANDLE HCIHandle,
HCI_TRANSPORT_PROPERTIES *pProps,
void *pContext)
{
- AR6K_HCI_BRIDGE_INFO *pHcidevInfo = (AR6K_HCI_BRIDGE_INFO *)pContext;
+ struct ar6k_hci_bridge_info *pHcidevInfo = (struct ar6k_hci_bridge_info *)pContext;
int status;
u32 address, hci_uart_pwr_mgmt_params;
// struct ar3k_config_info ar3kconfig;
@@ -325,7 +325,7 @@ static int ar6000_hci_transport_ready(HCI_TRANSPORT_HANDLE HCIHandle,
static void ar6000_hci_transport_failure(void *pContext, int Status)
{
- AR6K_HCI_BRIDGE_INFO *pHcidevInfo = (AR6K_HCI_BRIDGE_INFO *)pContext;
+ struct ar6k_hci_bridge_info *pHcidevInfo = (struct ar6k_hci_bridge_info *)pContext;
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("HCI Bridge: transport failure! \n"));
@@ -336,7 +336,7 @@ static void ar6000_hci_transport_failure(void *pContext, int Status)
static void ar6000_hci_transport_removed(void *pContext)
{
- AR6K_HCI_BRIDGE_INFO *pHcidevInfo = (AR6K_HCI_BRIDGE_INFO *)pContext;
+ struct ar6k_hci_bridge_info *pHcidevInfo = (struct ar6k_hci_bridge_info *)pContext;
AR_DEBUG_PRINTF(ATH_DEBUG_HCI_BRIDGE, ("HCI Bridge: transport removed. \n"));
@@ -349,7 +349,7 @@ static void ar6000_hci_transport_removed(void *pContext)
static void ar6000_hci_send_complete(void *pContext, HTC_PACKET *pPacket)
{
- AR6K_HCI_BRIDGE_INFO *pHcidevInfo = (AR6K_HCI_BRIDGE_INFO *)pContext;
+ struct ar6k_hci_bridge_info *pHcidevInfo = (struct ar6k_hci_bridge_info *)pContext;
void *osbuf = pPacket->pPktContext;
A_ASSERT(osbuf != NULL);
A_ASSERT(pHcidevInfo != NULL);
@@ -367,7 +367,7 @@ static void ar6000_hci_send_complete(void *pContext, HTC_PACKET *pPacket)
static void ar6000_hci_pkt_recv(void *pContext, HTC_PACKET *pPacket)
{
- AR6K_HCI_BRIDGE_INFO *pHcidevInfo = (AR6K_HCI_BRIDGE_INFO *)pContext;
+ struct ar6k_hci_bridge_info *pHcidevInfo = (struct ar6k_hci_bridge_info *)pContext;
struct sk_buff *skb;
A_ASSERT(pHcidevInfo != NULL);
@@ -432,7 +432,7 @@ static void ar6000_hci_pkt_recv(void *pContext, HTC_PACKET *pPacket)
static void ar6000_hci_pkt_refill(void *pContext, HCI_TRANSPORT_PACKET_TYPE Type, int BuffersAvailable)
{
- AR6K_HCI_BRIDGE_INFO *pHcidevInfo = (AR6K_HCI_BRIDGE_INFO *)pContext;
+ struct ar6k_hci_bridge_info *pHcidevInfo = (struct ar6k_hci_bridge_info *)pContext;
int refillCount;
if (Type == HCI_ACL_TYPE) {
@@ -449,7 +449,7 @@ static void ar6000_hci_pkt_refill(void *pContext, HCI_TRANSPORT_PACKET_TYPE Typ
static HCI_SEND_FULL_ACTION ar6000_hci_pkt_send_full(void *pContext, HTC_PACKET *pPacket)
{
- AR6K_HCI_BRIDGE_INFO *pHcidevInfo = (AR6K_HCI_BRIDGE_INFO *)pContext;
+ struct ar6k_hci_bridge_info *pHcidevInfo = (struct ar6k_hci_bridge_info *)pContext;
HCI_SEND_FULL_ACTION action = HCI_SEND_FULL_KEEP;
if (!pHcidevInfo->HciNormalMode) {
@@ -473,19 +473,19 @@ int ar6000_setup_hci(AR_SOFTC_T *ar)
int status = 0;
int i;
HTC_PACKET *pPacket;
- AR6K_HCI_BRIDGE_INFO *pHcidevInfo;
+ struct ar6k_hci_bridge_info *pHcidevInfo;
do {
- pHcidevInfo = (AR6K_HCI_BRIDGE_INFO *)A_MALLOC(sizeof(AR6K_HCI_BRIDGE_INFO));
+ pHcidevInfo = (struct ar6k_hci_bridge_info *)A_MALLOC(sizeof(struct ar6k_hci_bridge_info));
if (NULL == pHcidevInfo) {
status = A_NO_MEMORY;
break;
}
- A_MEMZERO(pHcidevInfo, sizeof(AR6K_HCI_BRIDGE_INFO));
+ A_MEMZERO(pHcidevInfo, sizeof(struct ar6k_hci_bridge_info));
#ifdef EXPORT_HCI_BRIDGE_INTERFACE
g_pHcidevInfo = pHcidevInfo;
pHcidevInfo->HCITransHdl = *(HCI_TRANSPORT_MISC_HANDLES *)ar;
@@ -567,9 +567,9 @@ void ar6000_cleanup_hci(AR_SOFTC_T *ar)
#endif
{
#ifdef EXPORT_HCI_BRIDGE_INTERFACE
- AR6K_HCI_BRIDGE_INFO *pHcidevInfo = g_pHcidevInfo;
+ struct ar6k_hci_bridge_info *pHcidevInfo = g_pHcidevInfo;
#else
- AR6K_HCI_BRIDGE_INFO *pHcidevInfo = (AR6K_HCI_BRIDGE_INFO *)ar->hcidev_info;
+ struct ar6k_hci_bridge_info *pHcidevInfo = (struct ar6k_hci_bridge_info *)ar->hcidev_info;
#endif
if (pHcidevInfo != NULL) {
@@ -607,9 +607,9 @@ int hci_test_send(AR_SOFTC_T *ar, struct sk_buff *skb)
HTC_PACKET *pPacket;
HTC_TX_TAG htc_tag = AR6K_DATA_PKT_TAG;
#ifdef EXPORT_HCI_BRIDGE_INTERFACE
- AR6K_HCI_BRIDGE_INFO *pHcidevInfo = g_pHcidevInfo;
+ struct ar6k_hci_bridge_info *pHcidevInfo = g_pHcidevInfo;
#else
- AR6K_HCI_BRIDGE_INFO *pHcidevInfo = (AR6K_HCI_BRIDGE_INFO *)ar->hcidev_info;
+ struct ar6k_hci_bridge_info *pHcidevInfo = (struct ar6k_hci_bridge_info *)ar->hcidev_info;
#endif
do {
@@ -666,7 +666,7 @@ int hci_test_send(AR_SOFTC_T *ar, struct sk_buff *skb)
void ar6000_set_default_ar3kconfig(AR_SOFTC_T *ar, void *ar3kconfig)
{
- AR6K_HCI_BRIDGE_INFO *pHcidevInfo = (AR6K_HCI_BRIDGE_INFO *)ar->hcidev_info;
+ struct ar6k_hci_bridge_info *pHcidevInfo = (struct ar6k_hci_bridge_info *)ar->hcidev_info;
struct ar3k_config_info *config = (struct ar3k_config_info *)ar3kconfig;
config->pHCIDev = pHcidevInfo->pHCIDev;
@@ -710,7 +710,7 @@ static int bt_send_frame(struct sk_buff *skb)
{
struct hci_dev *hdev = (struct hci_dev *)skb->dev;
HCI_TRANSPORT_PACKET_TYPE type;
- AR6K_HCI_BRIDGE_INFO *pHcidevInfo;
+ struct ar6k_hci_bridge_info *pHcidevInfo;
HTC_PACKET *pPacket;
int status = 0;
struct sk_buff *txSkb = NULL;
@@ -725,7 +725,7 @@ static int bt_send_frame(struct sk_buff *skb)
return -EBUSY;
}
- pHcidevInfo = (AR6K_HCI_BRIDGE_INFO *)hdev->driver_data;
+ pHcidevInfo = (struct ar6k_hci_bridge_info *)hdev->driver_data;
A_ASSERT(pHcidevInfo != NULL);
AR_DEBUG_PRINTF(ATH_DEBUG_HCI_SEND, ("+bt_send_frame type: %d \n",bt_cb(skb)->pkt_type));
@@ -832,11 +832,11 @@ static int bt_ioctl(struct hci_dev *hdev, unsigned int cmd, unsigned long arg)
*/
static int bt_flush(struct hci_dev *hdev)
{
- AR6K_HCI_BRIDGE_INFO *pHcidevInfo;
+ struct ar6k_hci_bridge_info *pHcidevInfo;
AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("HCI Bridge: bt_flush - enter\n"));
- pHcidevInfo = (AR6K_HCI_BRIDGE_INFO *)hdev->driver_data;
+ pHcidevInfo = (struct ar6k_hci_bridge_info *)hdev->driver_data;
/* TODO??? */
@@ -853,7 +853,7 @@ static void bt_destruct(struct hci_dev *hdev)
/* nothing to do here */
}
-static int bt_setup_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo)
+static int bt_setup_hci(struct ar6k_hci_bridge_info *pHcidevInfo)
{
int status = 0;
struct hci_dev *pHciDev = NULL;
@@ -913,7 +913,7 @@ static int bt_setup_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo)
return status;
}
-static void bt_cleanup_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo)
+static void bt_cleanup_hci(struct ar6k_hci_bridge_info *pHcidevInfo)
{
int err;
@@ -935,7 +935,7 @@ static void bt_cleanup_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo)
}
}
-static int bt_register_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo)
+static int bt_register_hci(struct ar6k_hci_bridge_info *pHcidevInfo)
{
int err;
int status = 0;
@@ -959,7 +959,7 @@ static int bt_register_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo)
return status;
}
-static bool bt_indicate_recv(AR6K_HCI_BRIDGE_INFO *pHcidevInfo,
+static bool bt_indicate_recv(struct ar6k_hci_bridge_info *pHcidevInfo,
HCI_TRANSPORT_PACKET_TYPE Type,
struct sk_buff *skb)
{
@@ -1022,7 +1022,7 @@ static bool bt_indicate_recv(AR6K_HCI_BRIDGE_INFO *pHcidevInfo,
return success;
}
-static struct sk_buff* bt_alloc_buffer(AR6K_HCI_BRIDGE_INFO *pHcidevInfo, int Length)
+static struct sk_buff* bt_alloc_buffer(struct ar6k_hci_bridge_info *pHcidevInfo, int Length)
{
struct sk_buff *skb;
/* in normal HCI mode we need to alloc from the bt core APIs */
@@ -1033,7 +1033,7 @@ static struct sk_buff* bt_alloc_buffer(AR6K_HCI_BRIDGE_INFO *pHcidevInfo, int Le
return skb;
}
-static void bt_free_buffer(AR6K_HCI_BRIDGE_INFO *pHcidevInfo, struct sk_buff *skb)
+static void bt_free_buffer(struct ar6k_hci_bridge_info *pHcidevInfo, struct sk_buff *skb)
{
kfree_skb(skb);
}
@@ -1041,21 +1041,21 @@ static void bt_free_buffer(AR6K_HCI_BRIDGE_INFO *pHcidevInfo, struct sk_buff *sk
#else // { CONFIG_BLUEZ_HCI_BRIDGE
/* stubs when we only want to test the HCI bridging Interface without the HT stack */
-static int bt_setup_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo)
+static int bt_setup_hci(struct ar6k_hci_bridge_info *pHcidevInfo)
{
return 0;
}
-static void bt_cleanup_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo)
+static void bt_cleanup_hci(struct ar6k_hci_bridge_info *pHcidevInfo)
{
}
-static int bt_register_hci(AR6K_HCI_BRIDGE_INFO *pHcidevInfo)
+static int bt_register_hci(struct ar6k_hci_bridge_info *pHcidevInfo)
{
A_ASSERT(false);
return A_ERROR;
}
-static bool bt_indicate_recv(AR6K_HCI_BRIDGE_INFO *pHcidevInfo,
+static bool bt_indicate_recv(struct ar6k_hci_bridge_info *pHcidevInfo,
HCI_TRANSPORT_PACKET_TYPE Type,
struct sk_buff *skb)
{
@@ -1063,12 +1063,12 @@ static bool bt_indicate_recv(AR6K_HCI_BRIDGE_INFO *pHcidevInfo,
return false;
}
-static struct sk_buff* bt_alloc_buffer(AR6K_HCI_BRIDGE_INFO *pHcidevInfo, int Length)
+static struct sk_buff* bt_alloc_buffer(struct ar6k_hci_bridge_info *pHcidevInfo, int Length)
{
A_ASSERT(false);
return NULL;
}
-static void bt_free_buffer(AR6K_HCI_BRIDGE_INFO *pHcidevInfo, struct sk_buff *skb)
+static void bt_free_buffer(struct ar6k_hci_bridge_info *pHcidevInfo, struct sk_buff *skb)
{
A_ASSERT(false);
}
--
1.7.4.15.g7811d
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 13/20] ath6kl: remove-typedef AR6K_IRQ_ENABLE_REGISTERS
2011-03-11 2:55 [PATCH 00/20] ath6kl: first series of cleanups Luis R. Rodriguez
` (11 preceding siblings ...)
2011-03-11 2:55 ` [PATCH 12/20] ath6kl: remove-typedef AR6K_HCI_BRIDGE_INFO Luis R. Rodriguez
@ 2011-03-11 2:55 ` Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 14/20] ath6kl: remove-typedef AR6K_IRQ_PROC_REGISTERS Luis R. Rodriguez
` (7 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Luis R. Rodriguez @ 2011-03-11 2:55 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-wireless, vmehta, naveen.singh, Luis R. Rodriguez
remove-typedef -s AR6K_IRQ_ENABLE_REGISTERS \
"struct ar6k_irq_enable_registers" drivers/staging/ath6kl/
Cc: Naveen Singh <naveen.singh@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/staging/ath6kl/htc2/AR6000/ar6k.c | 8 ++++----
drivers/staging/ath6kl/htc2/AR6000/ar6k.h | 10 +++++-----
drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c | 2 +-
drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c | 2 +-
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k.c b/drivers/staging/ath6kl/htc2/AR6000/ar6k.c
index 85d45a7..77fa618 100644
--- a/drivers/staging/ath6kl/htc2/AR6000/ar6k.c
+++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k.c
@@ -219,7 +219,7 @@ int DevSetup(struct ar6k_device *pDev)
int DevEnableInterrupts(struct ar6k_device *pDev)
{
int status;
- AR6K_IRQ_ENABLE_REGISTERS regs;
+ struct ar6k_irq_enable_registers regs;
LOCK_AR6K(pDev);
@@ -278,7 +278,7 @@ int DevEnableInterrupts(struct ar6k_device *pDev)
int DevDisableInterrupts(struct ar6k_device *pDev)
{
- AR6K_IRQ_ENABLE_REGISTERS regs;
+ struct ar6k_irq_enable_registers regs;
LOCK_AR6K(pDev);
/* Disable all interrupts */
@@ -407,7 +407,7 @@ static int DevDoEnableDisableRecvNormal(struct ar6k_device *pDev, bool EnableRec
{
int status = 0;
HTC_PACKET *pIOPacket = NULL;
- AR6K_IRQ_ENABLE_REGISTERS regs;
+ struct ar6k_irq_enable_registers regs;
/* take the lock to protect interrupt enable shadows */
LOCK_AR6K(pDev);
@@ -538,7 +538,7 @@ int DevWaitForPendingRecv(struct ar6k_device *pDev,u32 TimeoutInMs,bool *pbIsRec
void DevDumpRegisters(struct ar6k_device *pDev,
AR6K_IRQ_PROC_REGISTERS *pIrqProcRegs,
- AR6K_IRQ_ENABLE_REGISTERS *pIrqEnableRegs)
+ struct ar6k_irq_enable_registers *pIrqEnableRegs)
{
AR_DEBUG_PRINTF(ATH_DEBUG_ANY, ("\n<------- Register Table -------->\n"));
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k.h b/drivers/staging/ath6kl/htc2/AR6000/ar6k.h
index 0bee46a..fc781d1 100644
--- a/drivers/staging/ath6kl/htc2/AR6000/ar6k.h
+++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k.h
@@ -58,12 +58,12 @@ typedef PREPACK struct _AR6K_IRQ_PROC_REGISTERS {
#define AR6K_IRQ_PROC_REGS_SIZE sizeof(AR6K_IRQ_PROC_REGISTERS)
-typedef PREPACK struct _AR6K_IRQ_ENABLE_REGISTERS {
+PREPACK struct ar6k_irq_enable_registers {
u8 int_status_enable;
u8 cpu_int_status_enable;
u8 error_status_enable;
u8 counter_int_status_enable;
-} POSTPACK AR6K_IRQ_ENABLE_REGISTERS;
+} POSTPACK;
PREPACK struct ar6k_gmbox_ctrl_registers {
u8 int_status_enable;
@@ -71,7 +71,7 @@ PREPACK struct ar6k_gmbox_ctrl_registers {
#include "athendpack.h"
-#define AR6K_IRQ_ENABLE_REGS_SIZE sizeof(AR6K_IRQ_ENABLE_REGISTERS)
+#define AR6K_IRQ_ENABLE_REGS_SIZE sizeof(struct ar6k_irq_enable_registers)
#define AR6K_REG_IO_BUFFER_SIZE 32
#define AR6K_MAX_REG_IO_BUFFERS 8
@@ -110,7 +110,7 @@ struct ar6k_device {
u8 _Pad1[A_CACHE_LINE_PAD];
AR6K_IRQ_PROC_REGISTERS IrqProcRegisters; /* cache-line safe with pads around */
u8 _Pad2[A_CACHE_LINE_PAD];
- AR6K_IRQ_ENABLE_REGISTERS IrqEnableRegisters; /* cache-line safe with pads around */
+ struct ar6k_irq_enable_registers IrqEnableRegisters; /* cache-line safe with pads around */
u8 _Pad3[A_CACHE_LINE_PAD];
void *HIFDevice;
u32 BlockSize;
@@ -160,7 +160,7 @@ int DevCheckPendingRecvMsgsAsync(void *context);
void DevAsyncIrqProcessComplete(struct ar6k_device *pDev);
void DevDumpRegisters(struct ar6k_device *pDev,
AR6K_IRQ_PROC_REGISTERS *pIrqProcRegs,
- AR6K_IRQ_ENABLE_REGISTERS *pIrqEnableRegs);
+ struct ar6k_irq_enable_registers *pIrqEnableRegs);
#define DEV_STOP_RECV_ASYNC true
#define DEV_STOP_RECV_SYNC false
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c b/drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
index aa45590..3aafbea 100644
--- a/drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
+++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
@@ -747,7 +747,7 @@ int DevDsrHandler(void *context)
void DumpAR6KDevState(struct ar6k_device *pDev)
{
int status;
- AR6K_IRQ_ENABLE_REGISTERS regs;
+ struct ar6k_irq_enable_registers regs;
AR6K_IRQ_PROC_REGISTERS procRegs;
LOCK_AR6K(pDev);
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c b/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c
index cbfbdea..1b44d07 100644
--- a/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c
+++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c
@@ -77,7 +77,7 @@ static void DevGMboxIRQActionAsyncHandler(void *Context, HTC_PACKET *pPacket)
static int DevGMboxCounterEnableDisable(struct ar6k_device *pDev, GMBOX_IRQ_ACTION_TYPE IrqAction, bool AsyncMode)
{
int status = 0;
- AR6K_IRQ_ENABLE_REGISTERS regs;
+ struct ar6k_irq_enable_registers regs;
HTC_PACKET *pIOPacket = NULL;
LOCK_AR6K(pDev);
--
1.7.4.15.g7811d
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 14/20] ath6kl: remove-typedef AR6K_IRQ_PROC_REGISTERS
2011-03-11 2:55 [PATCH 00/20] ath6kl: first series of cleanups Luis R. Rodriguez
` (12 preceding siblings ...)
2011-03-11 2:55 ` [PATCH 13/20] ath6kl: remove-typedef AR6K_IRQ_ENABLE_REGISTERS Luis R. Rodriguez
@ 2011-03-11 2:55 ` Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 15/20] ath6kl: remove-typedef AR_VIRTUAL_INTERFACE_T Luis R. Rodriguez
` (6 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Luis R. Rodriguez @ 2011-03-11 2:55 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-wireless, vmehta, naveen.singh, Luis R. Rodriguez
remove-typedef -s AR6K_IRQ_PROC_REGISTERS \
"struct ar6k_irq_proc_registers" drivers/staging/ath6kl/
Cc: Naveen Singh <naveen.singh@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/staging/ath6kl/htc2/AR6000/ar6k.c | 2 +-
drivers/staging/ath6kl/htc2/AR6000/ar6k.h | 10 +++++-----
drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c | 4 ++--
drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k.c b/drivers/staging/ath6kl/htc2/AR6000/ar6k.c
index 77fa618..bdaffd7 100644
--- a/drivers/staging/ath6kl/htc2/AR6000/ar6k.c
+++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k.c
@@ -537,7 +537,7 @@ int DevWaitForPendingRecv(struct ar6k_device *pDev,u32 TimeoutInMs,bool *pbIsRec
}
void DevDumpRegisters(struct ar6k_device *pDev,
- AR6K_IRQ_PROC_REGISTERS *pIrqProcRegs,
+ struct ar6k_irq_proc_registers *pIrqProcRegs,
struct ar6k_irq_enable_registers *pIrqEnableRegs)
{
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k.h b/drivers/staging/ath6kl/htc2/AR6000/ar6k.h
index fc781d1..247cf56 100644
--- a/drivers/staging/ath6kl/htc2/AR6000/ar6k.h
+++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k.h
@@ -43,7 +43,7 @@
//#define MBOXHW_UNIT_TEST 1
#include "athstartpack.h"
-typedef PREPACK struct _AR6K_IRQ_PROC_REGISTERS {
+PREPACK struct ar6k_irq_proc_registers {
u8 host_int_status;
u8 cpu_int_status;
u8 error_int_status;
@@ -54,9 +54,9 @@ typedef PREPACK struct _AR6K_IRQ_PROC_REGISTERS {
u8 gmbox_rx_avail;
u32 rx_lookahead[2];
u32 rx_gmbox_lookahead_alias[2];
-} POSTPACK AR6K_IRQ_PROC_REGISTERS;
+} POSTPACK;
-#define AR6K_IRQ_PROC_REGS_SIZE sizeof(AR6K_IRQ_PROC_REGISTERS)
+#define AR6K_IRQ_PROC_REGS_SIZE sizeof(struct ar6k_irq_proc_registers)
PREPACK struct ar6k_irq_enable_registers {
u8 int_status_enable;
@@ -108,7 +108,7 @@ struct ar6k_gmbox_info {
struct ar6k_device {
A_MUTEX_T Lock;
u8 _Pad1[A_CACHE_LINE_PAD];
- AR6K_IRQ_PROC_REGISTERS IrqProcRegisters; /* cache-line safe with pads around */
+ struct ar6k_irq_proc_registers IrqProcRegisters; /* cache-line safe with pads around */
u8 _Pad2[A_CACHE_LINE_PAD];
struct ar6k_irq_enable_registers IrqEnableRegisters; /* cache-line safe with pads around */
u8 _Pad3[A_CACHE_LINE_PAD];
@@ -159,7 +159,7 @@ int DevDsrHandler(void *context);
int DevCheckPendingRecvMsgsAsync(void *context);
void DevAsyncIrqProcessComplete(struct ar6k_device *pDev);
void DevDumpRegisters(struct ar6k_device *pDev,
- AR6K_IRQ_PROC_REGISTERS *pIrqProcRegs,
+ struct ar6k_irq_proc_registers *pIrqProcRegs,
struct ar6k_irq_enable_registers *pIrqEnableRegs);
#define DEV_STOP_RECV_ASYNC true
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c b/drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
index 3aafbea..bac4f93 100644
--- a/drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
+++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c
@@ -331,7 +331,7 @@ static void DevGetEventAsyncHandler(void *Context, HTC_PACKET *pPacket)
}
} else {
/* standard interrupt table handling.... */
- AR6K_IRQ_PROC_REGISTERS *pReg = (AR6K_IRQ_PROC_REGISTERS *)pPacket->pBuffer;
+ struct ar6k_irq_proc_registers *pReg = (struct ar6k_irq_proc_registers *)pPacket->pBuffer;
u8 host_int_status;
host_int_status = pReg->host_int_status & pDev->IrqEnableRegisters.int_status_enable;
@@ -748,7 +748,7 @@ void DumpAR6KDevState(struct ar6k_device *pDev)
{
int status;
struct ar6k_irq_enable_registers regs;
- AR6K_IRQ_PROC_REGISTERS procRegs;
+ struct ar6k_irq_proc_registers procRegs;
LOCK_AR6K(pDev);
/* copy into our temp area */
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c b/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c
index 1b44d07..106f9bf 100644
--- a/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c
+++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c
@@ -638,7 +638,7 @@ int DevGMboxRecvLookAheadPeek(struct ar6k_device *pDev, u8 *pLookAheadBuffer, in
{
int status = 0;
- AR6K_IRQ_PROC_REGISTERS procRegs;
+ struct ar6k_irq_proc_registers procRegs;
int maxCopy;
do {
--
1.7.4.15.g7811d
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 15/20] ath6kl: remove-typedef AR_VIRTUAL_INTERFACE_T
2011-03-11 2:55 [PATCH 00/20] ath6kl: first series of cleanups Luis R. Rodriguez
` (13 preceding siblings ...)
2011-03-11 2:55 ` [PATCH 14/20] ath6kl: remove-typedef AR6K_IRQ_PROC_REGISTERS Luis R. Rodriguez
@ 2011-03-11 2:55 ` Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 16/20] ath6kl: remove-typedef ATHBT_FILTER_INSTANCE Luis R. Rodriguez
` (5 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Luis R. Rodriguez @ 2011-03-11 2:55 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-wireless, vmehta, naveen.singh, Luis R. Rodriguez
remove-typedef -s AR_VIRTUAL_INTERFACE_T \
"struct ar_virtual_interface" drivers/staging/ath6kl/
Cc: Naveen Singh <naveen.singh@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/staging/ath6kl/os/linux/ar6000_drv.c | 12 ++++++------
.../staging/ath6kl/os/linux/include/ar6000_drv.h | 6 +++---
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
index 3397995..e52a88a 100644
--- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c
+++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
@@ -6402,10 +6402,10 @@ static void DoHTCSendPktsTest(AR_SOFTC_T *ar, int MapNo, HTC_ENDPOINT_ID eid, st
int ar6000_start_ap_interface(AR_SOFTC_T *ar)
{
- AR_VIRTUAL_INTERFACE_T *arApDev;
+ struct ar_virtual_interface *arApDev;
/* Change net_device to point to AP instance */
- arApDev = (AR_VIRTUAL_INTERFACE_T *)ar->arApDev;
+ arApDev = (struct ar_virtual_interface *)ar->arApDev;
ar->arNetDev = arApDev->arNetDev;
return 0;
@@ -6413,10 +6413,10 @@ int ar6000_start_ap_interface(AR_SOFTC_T *ar)
int ar6000_stop_ap_interface(AR_SOFTC_T *ar)
{
- AR_VIRTUAL_INTERFACE_T *arApDev;
+ struct ar_virtual_interface *arApDev;
/* Change net_device to point to sta instance */
- arApDev = (AR_VIRTUAL_INTERFACE_T *)ar->arApDev;
+ arApDev = (struct ar_virtual_interface *)ar->arApDev;
if (arApDev) {
ar->arNetDev = arApDev->arStaNetDev;
}
@@ -6428,9 +6428,9 @@ int ar6000_stop_ap_interface(AR_SOFTC_T *ar)
int ar6000_create_ap_interface(AR_SOFTC_T *ar, char *ap_ifname)
{
struct net_device *dev;
- AR_VIRTUAL_INTERFACE_T *arApDev;
+ struct ar_virtual_interface *arApDev;
- dev = alloc_etherdev(sizeof(AR_VIRTUAL_INTERFACE_T));
+ dev = alloc_etherdev(sizeof(struct ar_virtual_interface));
if (dev == NULL) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("ar6000_create_ap_interface: can't alloc etherdev\n"));
return A_ERROR;
diff --git a/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h b/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
index 0beba09..2c6f873 100644
--- a/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
+++ b/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
@@ -625,11 +625,11 @@ typedef struct ar6_softc {
} AR_SOFTC_T;
#ifdef CONFIG_AP_VIRTUAL_ADAPTER_SUPPORT
-typedef struct {
+struct ar_virtual_interface {
struct net_device *arNetDev; /* net_device pointer */
AR_SOFTC_T *arDev; /* ar device pointer */
struct net_device *arStaNetDev; /* net_device pointer */
-} AR_VIRTUAL_INTERFACE_T;
+};
#endif /* CONFIG_AP_VIRTUAL_ADAPTER_SUPPORT */
#ifdef ATH6K_CONFIG_CFG80211
@@ -645,7 +645,7 @@ static inline void *ar6k_priv(struct net_device *dev)
if (arApNetDev == dev) {
/* return arDev saved in virtual interface context */
- AR_VIRTUAL_INTERFACE_T *arVirDev;
+ struct ar_virtual_interface *arVirDev;
arVirDev = netdev_priv(dev);
return arVirDev->arDev;
} else {
--
1.7.4.15.g7811d
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 16/20] ath6kl: remove-typedef ATHBT_FILTER_INSTANCE
2011-03-11 2:55 [PATCH 00/20] ath6kl: first series of cleanups Luis R. Rodriguez
` (14 preceding siblings ...)
2011-03-11 2:55 ` [PATCH 15/20] ath6kl: remove-typedef AR_VIRTUAL_INTERFACE_T Luis R. Rodriguez
@ 2011-03-11 2:55 ` Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 17/20] ath6kl: remove-typedef ATH_DEBUG_MASK_DESCRIPTION Luis R. Rodriguez
` (4 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Luis R. Rodriguez @ 2011-03-11 2:55 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-wireless, vmehta, naveen.singh, Luis R. Rodriguez
We mark this as unused as well, given that I find no users,
at a later time we can determine to nuke this or not...
Cc: Naveen Singh <naveen.singh@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/staging/ath6kl/include/athbtfilter.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/ath6kl/include/athbtfilter.h b/drivers/staging/ath6kl/include/athbtfilter.h
index 378f967..81456ee 100644
--- a/drivers/staging/ath6kl/include/athbtfilter.h
+++ b/drivers/staging/ath6kl/include/athbtfilter.h
@@ -61,7 +61,7 @@ typedef enum _ATHBT_STATE {
typedef void (*ATHBT_INDICATE_STATE_FN)(void *pContext, ATHBT_STATE_INDICATION Indication, ATHBT_STATE State, unsigned char LMPVersion);
-typedef struct _ATHBT_FILTER_INSTANCE {
+struct athbt_filter_instance {
#ifdef UNDER_CE
WCHAR *pWlanAdapterName; /* filled in by user */
#else
@@ -74,7 +74,7 @@ typedef struct _ATHBT_FILTER_INSTANCE {
ATHBT_FILTER_DATA_FN pFilterAclDataOut; /* function ptr to filter ACL data out (to radio) */
ATHBT_FILTER_DATA_FN pFilterAclDataIn; /* function ptr to filter ACL data in (from radio) */
ATHBT_INDICATE_STATE_FN pIndicateState; /* function ptr to indicate a state */
-} ATH_BT_FILTER_INSTANCE;
+}; /* XXX: unused ? */
/* API MACROS */
--
1.7.4.15.g7811d
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 17/20] ath6kl: remove-typedef ATH_DEBUG_MASK_DESCRIPTION
2011-03-11 2:55 [PATCH 00/20] ath6kl: first series of cleanups Luis R. Rodriguez
` (15 preceding siblings ...)
2011-03-11 2:55 ` [PATCH 16/20] ath6kl: remove-typedef ATHBT_FILTER_INSTANCE Luis R. Rodriguez
@ 2011-03-11 2:55 ` Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 18/20] ath6kl: remove-typedef BUFFER_PROC_LIST Luis R. Rodriguez
` (3 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Luis R. Rodriguez @ 2011-03-11 2:55 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-wireless, vmehta, naveen.singh, Luis R. Rodriguez
remove-typedef -s ATH_DEBUG_MASK_DESCRIPTION \
"struct ath_debug_mask_description" drivers/staging/ath6kl/
Cc: Naveen Singh <naveen.singh@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/staging/ath6kl/bmi/src/bmi.c | 2 +-
drivers/staging/ath6kl/htc2/htc.c | 2 +-
drivers/staging/ath6kl/include/a_debug.h | 10 +++++-----
drivers/staging/ath6kl/miscdrv/common_drv.c | 2 +-
drivers/staging/ath6kl/os/linux/ar6000_drv.c | 2 +-
drivers/staging/ath6kl/os/linux/ar6000_pm.c | 2 +-
drivers/staging/ath6kl/wlan/src/wlan_node.c | 2 +-
drivers/staging/ath6kl/wmi/wmi.c | 2 +-
8 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/ath6kl/bmi/src/bmi.c b/drivers/staging/ath6kl/bmi/src/bmi.c
index 37f7cbc..a9615b7 100644
--- a/drivers/staging/ath6kl/bmi/src/bmi.c
+++ b/drivers/staging/ath6kl/bmi/src/bmi.c
@@ -33,7 +33,7 @@
#include "bmi_internal.h"
#ifdef ATH_DEBUG_MODULE
-static ATH_DEBUG_MASK_DESCRIPTION bmi_debug_desc[] = {
+static struct ath_debug_mask_description bmi_debug_desc[] = {
{ ATH_DEBUG_BMI , "BMI Tracing"},
};
diff --git a/drivers/staging/ath6kl/htc2/htc.c b/drivers/staging/ath6kl/htc2/htc.c
index 8bde7bf..bb999b6 100644
--- a/drivers/staging/ath6kl/htc2/htc.c
+++ b/drivers/staging/ath6kl/htc2/htc.c
@@ -23,7 +23,7 @@
#include "htc_internal.h"
#ifdef ATH_DEBUG_MODULE
-static ATH_DEBUG_MASK_DESCRIPTION g_HTCDebugDescription[] = {
+static struct ath_debug_mask_description g_HTCDebugDescription[] = {
{ ATH_DEBUG_SEND , "Send"},
{ ATH_DEBUG_RECV , "Recv"},
{ ATH_DEBUG_SYNC , "Sync"},
diff --git a/drivers/staging/ath6kl/include/a_debug.h b/drivers/staging/ath6kl/include/a_debug.h
index 0e5430d..d433942 100644
--- a/drivers/staging/ath6kl/include/a_debug.h
+++ b/drivers/staging/ath6kl/include/a_debug.h
@@ -95,7 +95,7 @@ void DebugDumpBytes(u8 *buffer, u16 length, char *pDescription);
* #define ATH_DEBUG_BMI ATH_DEBUG_MAKE_MODULE_MASK(0)
*
* #ifdef DEBUG
- * static ATH_DEBUG_MASK_DESCRIPTION bmi_debug_desc[] = {
+ * static struct ath_debug_mask_description bmi_debug_desc[] = {
* { ATH_DEBUG_BMI , "BMI Tracing"}, <== description of the module specific mask
* };
*
@@ -118,10 +118,10 @@ void DebugDumpBytes(u8 *buffer, u16 length, char *pDescription);
#define ATH_DEBUG_MAX_MASK_DESC_LENGTH 32
#define ATH_DEBUG_MAX_MOD_DESC_LENGTH 64
-typedef struct {
+struct ath_debug_mask_description {
u32 Mask;
char Description[ATH_DEBUG_MAX_MASK_DESC_LENGTH];
-} ATH_DEBUG_MASK_DESCRIPTION;
+};
#define ATH_DEBUG_INFO_FLAGS_REGISTERED (1 << 0)
@@ -132,10 +132,10 @@ typedef struct _ATH_DEBUG_MODULE_DBG_INFO{
u32 Flags;
u32 CurrentMask;
int MaxDescriptions;
- ATH_DEBUG_MASK_DESCRIPTION *pMaskDescriptions; /* pointer to array of descriptions */
+ struct ath_debug_mask_description *pMaskDescriptions; /* pointer to array of descriptions */
} ATH_DEBUG_MODULE_DBG_INFO;
-#define ATH_DEBUG_DESCRIPTION_COUNT(d) (int)((sizeof((d))) / (sizeof(ATH_DEBUG_MASK_DESCRIPTION)))
+#define ATH_DEBUG_DESCRIPTION_COUNT(d) (int)((sizeof((d))) / (sizeof(struct ath_debug_mask_description)))
#define GET_ATH_MODULE_DEBUG_VAR_NAME(s) _XGET_ATH_MODULE_NAME_DEBUG_(s)
#define GET_ATH_MODULE_DEBUG_VAR_MASK(s) _XGET_ATH_MODULE_NAME_DEBUG_(s).CurrentMask
diff --git a/drivers/staging/ath6kl/miscdrv/common_drv.c b/drivers/staging/ath6kl/miscdrv/common_drv.c
index b5f74c5..3ada331 100644
--- a/drivers/staging/ath6kl/miscdrv/common_drv.c
+++ b/drivers/staging/ath6kl/miscdrv/common_drv.c
@@ -834,7 +834,7 @@ void DebugDumpBytes(u8 *buffer, u16 length, char *pDescription)
void a_dump_module_debug_info(ATH_DEBUG_MODULE_DBG_INFO *pInfo)
{
int i;
- ATH_DEBUG_MASK_DESCRIPTION *pDesc;
+ struct ath_debug_mask_description *pDesc;
if (pInfo == NULL) {
return;
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
index e52a88a..811235a 100644
--- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c
+++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
@@ -60,7 +60,7 @@ u8 null_mac[] = {0x0, 0x0, 0x0, 0x0, 0x0, 0x0};
#define ATH_DEBUG_HTC_RAW ATH_DEBUG_MAKE_MODULE_MASK(5)
#define ATH_DEBUG_HCI_BRIDGE ATH_DEBUG_MAKE_MODULE_MASK(6)
-static ATH_DEBUG_MASK_DESCRIPTION driver_debug_desc[] = {
+static struct ath_debug_mask_description driver_debug_desc[] = {
{ ATH_DEBUG_DBG_LOG , "Target Debug Logs"},
{ ATH_DEBUG_WLAN_CONNECT , "WLAN connect"},
{ ATH_DEBUG_WLAN_SCAN , "WLAN scan"},
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_pm.c b/drivers/staging/ath6kl/os/linux/ar6000_pm.c
index 46342d8..5659ad8 100644
--- a/drivers/staging/ath6kl/os/linux/ar6000_pm.c
+++ b/drivers/staging/ath6kl/os/linux/ar6000_pm.c
@@ -44,7 +44,7 @@ extern void android_ar6k_check_wow_status(AR_SOFTC_T *ar, struct sk_buff *skb, b
#define ATH_DEBUG_PM ATH_DEBUG_MAKE_MODULE_MASK(0)
#ifdef DEBUG
-static ATH_DEBUG_MASK_DESCRIPTION pm_debug_desc[] = {
+static struct ath_debug_mask_description pm_debug_desc[] = {
{ ATH_DEBUG_PM , "System power management"},
};
diff --git a/drivers/staging/ath6kl/wlan/src/wlan_node.c b/drivers/staging/ath6kl/wlan/src/wlan_node.c
index 83c4dc3..1a3ac7d 100644
--- a/drivers/staging/ath6kl/wlan/src/wlan_node.c
+++ b/drivers/staging/ath6kl/wlan/src/wlan_node.c
@@ -40,7 +40,7 @@
#ifdef ATH_DEBUG_MODULE
-static ATH_DEBUG_MASK_DESCRIPTION wlan_debug_desc[] = {
+static struct ath_debug_mask_description wlan_debug_desc[] = {
{ ATH_DEBUG_WLAN , "General WLAN Node Tracing"},
};
diff --git a/drivers/staging/ath6kl/wmi/wmi.c b/drivers/staging/ath6kl/wmi/wmi.c
index 80ba629..0ddaee2 100644
--- a/drivers/staging/ath6kl/wmi/wmi.c
+++ b/drivers/staging/ath6kl/wmi/wmi.c
@@ -48,7 +48,7 @@
#ifdef ATH_DEBUG_MODULE
-static ATH_DEBUG_MASK_DESCRIPTION wmi_debug_desc[] = {
+static struct ath_debug_mask_description wmi_debug_desc[] = {
{ ATH_DEBUG_WMI , "General WMI Tracing"},
};
--
1.7.4.15.g7811d
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 18/20] ath6kl: remove-typedef BUFFER_PROC_LIST
2011-03-11 2:55 [PATCH 00/20] ath6kl: first series of cleanups Luis R. Rodriguez
` (16 preceding siblings ...)
2011-03-11 2:55 ` [PATCH 17/20] ath6kl: remove-typedef ATH_DEBUG_MASK_DESCRIPTION Luis R. Rodriguez
@ 2011-03-11 2:55 ` Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 19/20] ath6kl: remove-typedef COMMON_CREDIT_STATE_INFO Luis R. Rodriguez
` (2 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Luis R. Rodriguez @ 2011-03-11 2:55 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-wireless, vmehta, naveen.singh, Luis R. Rodriguez
remove-typedef -s BUFFER_PROC_LIST \
"struct buffer_proc_list" drivers/staging/ath6kl/
Cc: Naveen Singh <naveen.singh@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/staging/ath6kl/htc2/AR6000/ar6k.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k.c b/drivers/staging/ath6kl/htc2/AR6000/ar6k.c
index bdaffd7..2797b55 100644
--- a/drivers/staging/ath6kl/htc2/AR6000/ar6k.c
+++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k.c
@@ -1017,10 +1017,10 @@ static u32 g_BlockSizes[AR6K_MAILBOXES];
#define BUFFER_PROC_LIST_DEPTH 4
-typedef struct _BUFFER_PROC_LIST{
+struct buffer_proc_list {
u8 *pBuffer;
u32 length;
-}BUFFER_PROC_LIST;
+};
#define PUSH_BUFF_PROC_ENTRY(pList,len,pCurrpos) \
@@ -1032,7 +1032,7 @@ typedef struct _BUFFER_PROC_LIST{
}
/* a simple and crude way to send different "message" sizes */
-static void AssembleBufferList(BUFFER_PROC_LIST *pList)
+static void AssembleBufferList(struct buffer_proc_list *pList)
{
u8 *pBuffer = g_Buffer;
@@ -1095,7 +1095,7 @@ static bool CheckBuffers(void)
{
int i;
bool success = true;
- BUFFER_PROC_LIST checkList[BUFFER_PROC_LIST_DEPTH];
+ struct buffer_proc_list checkList[BUFFER_PROC_LIST_DEPTH];
/* assemble the list */
AssembleBufferList(checkList);
@@ -1117,7 +1117,7 @@ static bool CheckBuffers(void)
static u16 GetEndMarker(void)
{
u8 *pBuffer;
- BUFFER_PROC_LIST checkList[BUFFER_PROC_LIST_DEPTH];
+ struct buffer_proc_list checkList[BUFFER_PROC_LIST_DEPTH];
/* fill up buffers with the normal counting pattern */
InitBuffers(FILL_COUNTING);
@@ -1138,7 +1138,7 @@ static int SendBuffers(struct ar6k_device *pDev, int mbox)
{
int status = 0;
u32 request = HIF_WR_SYNC_BLOCK_INC;
- BUFFER_PROC_LIST sendList[BUFFER_PROC_LIST_DEPTH];
+ struct buffer_proc_list sendList[BUFFER_PROC_LIST_DEPTH];
int i;
int totalBytes = 0;
int paddedLength;
@@ -1229,7 +1229,7 @@ static int RecvBuffers(struct ar6k_device *pDev, int mbox)
{
int status = 0;
u32 request = HIF_RD_SYNC_BLOCK_INC;
- BUFFER_PROC_LIST recvList[BUFFER_PROC_LIST_DEPTH];
+ struct buffer_proc_list recvList[BUFFER_PROC_LIST_DEPTH];
int curBuffer;
int credits;
int i;
--
1.7.4.15.g7811d
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 19/20] ath6kl: remove-typedef COMMON_CREDIT_STATE_INFO
2011-03-11 2:55 [PATCH 00/20] ath6kl: first series of cleanups Luis R. Rodriguez
` (17 preceding siblings ...)
2011-03-11 2:55 ` [PATCH 18/20] ath6kl: remove-typedef BUFFER_PROC_LIST Luis R. Rodriguez
@ 2011-03-11 2:55 ` Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 20/20] ath6kl: remove-typedef DEV_SCATTER_DMA_VIRTUAL_INFO Luis R. Rodriguez
2011-03-11 22:28 ` [PATCH 00/20] ath6kl: first series of cleanups Greg KH
20 siblings, 0 replies; 22+ messages in thread
From: Luis R. Rodriguez @ 2011-03-11 2:55 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-wireless, vmehta, naveen.singh, Luis R. Rodriguez
remove-typedef -s COMMON_CREDIT_STATE_INFO \
"struct common_credit_state_info" drivers/staging/ath6kl/
Cc: Naveen Singh <naveen.singh@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/staging/ath6kl/include/common_drv.h | 6 +++---
drivers/staging/ath6kl/miscdrv/credit_dist.c | 18 +++++++++---------
.../staging/ath6kl/os/linux/include/ar6000_drv.h | 2 +-
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/staging/ath6kl/include/common_drv.h b/drivers/staging/ath6kl/include/common_drv.h
index 6ed4901..f5bc9c3 100644
--- a/drivers/staging/ath6kl/include/common_drv.h
+++ b/drivers/staging/ath6kl/include/common_drv.h
@@ -29,12 +29,12 @@
/* structure that is the state information for the default credit distribution callback
* drivers should instantiate (zero-init as well) this structure in their driver instance
* and pass it as a context to the HTC credit distribution functions */
-typedef struct _COMMON_CREDIT_STATE_INFO {
+struct common_credit_state_info {
int TotalAvailableCredits; /* total credits in the system at startup */
int CurrentFreeCredits; /* credits available in the pool that have not been
given out to endpoints */
HTC_ENDPOINT_CREDIT_DIST *pLowestPriEpDist; /* pointer to the lowest priority endpoint dist struct */
-} COMMON_CREDIT_STATE_INFO;
+};
typedef struct {
s32 (*setupTransport)(void *ar);
@@ -64,7 +64,7 @@ extern "C" {
#endif
/* OS-independent APIs */
-int ar6000_setup_credit_dist(HTC_HANDLE HTCHandle, COMMON_CREDIT_STATE_INFO *pCredInfo);
+int ar6000_setup_credit_dist(HTC_HANDLE HTCHandle, struct common_credit_state_info *pCredInfo);
int ar6000_ReadRegDiag(HIF_DEVICE *hifDevice, u32 *address, u32 *data);
diff --git a/drivers/staging/ath6kl/miscdrv/credit_dist.c b/drivers/staging/ath6kl/miscdrv/credit_dist.c
index 68b1ed6..8c418d2 100644
--- a/drivers/staging/ath6kl/miscdrv/credit_dist.c
+++ b/drivers/staging/ath6kl/miscdrv/credit_dist.c
@@ -41,14 +41,14 @@
#define DATA_SVCS_USED 4
#endif
-static void RedistributeCredits(COMMON_CREDIT_STATE_INFO *pCredInfo,
+static void RedistributeCredits(struct common_credit_state_info *pCredInfo,
HTC_ENDPOINT_CREDIT_DIST *pEPDistList);
-static void SeekCredits(COMMON_CREDIT_STATE_INFO *pCredInfo,
+static void SeekCredits(struct common_credit_state_info *pCredInfo,
HTC_ENDPOINT_CREDIT_DIST *pEPDistList);
/* reduce an ep's credits back to a set limit */
-static INLINE void ReduceCredits(COMMON_CREDIT_STATE_INFO *pCredInfo,
+static INLINE void ReduceCredits(struct common_credit_state_info *pCredInfo,
HTC_ENDPOINT_CREDIT_DIST *pEpDist,
int Limit)
{
@@ -86,7 +86,7 @@ static void ar6000_credit_init(void *Context,
{
HTC_ENDPOINT_CREDIT_DIST *pCurEpDist;
int count;
- COMMON_CREDIT_STATE_INFO *pCredInfo = (COMMON_CREDIT_STATE_INFO *)Context;
+ struct common_credit_state_info *pCredInfo = (struct common_credit_state_info *)Context;
pCredInfo->CurrentFreeCredits = TotalCredits;
pCredInfo->TotalAvailableCredits = TotalCredits;
@@ -179,7 +179,7 @@ static void ar6000_credit_distribute(void *Context,
HTC_CREDIT_DIST_REASON Reason)
{
HTC_ENDPOINT_CREDIT_DIST *pCurEpDist;
- COMMON_CREDIT_STATE_INFO *pCredInfo = (COMMON_CREDIT_STATE_INFO *)Context;
+ struct common_credit_state_info *pCredInfo = (struct common_credit_state_info *)Context;
switch (Reason) {
case HTC_CREDIT_DIST_SEND_COMPLETE :
@@ -243,7 +243,7 @@ static void ar6000_credit_distribute(void *Context,
}
/* redistribute credits based on activity change */
-static void RedistributeCredits(COMMON_CREDIT_STATE_INFO *pCredInfo,
+static void RedistributeCredits(struct common_credit_state_info *pCredInfo,
HTC_ENDPOINT_CREDIT_DIST *pEPDistList)
{
HTC_ENDPOINT_CREDIT_DIST *pCurEpDist = pEPDistList;
@@ -283,7 +283,7 @@ static void RedistributeCredits(COMMON_CREDIT_STATE_INFO *pCredInfo,
}
/* HTC has an endpoint that needs credits, pEPDist is the endpoint in question */
-static void SeekCredits(COMMON_CREDIT_STATE_INFO *pCredInfo,
+static void SeekCredits(struct common_credit_state_info *pCredInfo,
HTC_ENDPOINT_CREDIT_DIST *pEPDist)
{
HTC_ENDPOINT_CREDIT_DIST *pCurEpDist;
@@ -393,11 +393,11 @@ static void SeekCredits(COMMON_CREDIT_STATE_INFO *pCredInfo,
}
/* initialize and setup credit distribution */
-int ar6000_setup_credit_dist(HTC_HANDLE HTCHandle, COMMON_CREDIT_STATE_INFO *pCredInfo)
+int ar6000_setup_credit_dist(HTC_HANDLE HTCHandle, struct common_credit_state_info *pCredInfo)
{
HTC_SERVICE_ID servicepriority[5];
- A_MEMZERO(pCredInfo,sizeof(COMMON_CREDIT_STATE_INFO));
+ A_MEMZERO(pCredInfo,sizeof(struct common_credit_state_info));
servicepriority[0] = WMI_CONTROL_SVC; /* highest */
servicepriority[1] = WMI_DATA_VO_SVC;
diff --git a/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h b/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
index 2c6f873..2373ed5 100644
--- a/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
+++ b/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
@@ -550,7 +550,7 @@ typedef struct ar6_softc {
bool arNetQueueStopped;
bool arRawIfInit;
int arDeviceIndex;
- COMMON_CREDIT_STATE_INFO arCreditStateInfo;
+ struct common_credit_state_info arCreditStateInfo;
bool arWMIControlEpFull;
bool dbgLogFetchInProgress;
u8 log_buffer[DBGLOG_HOST_LOG_BUFFER_SIZE];
--
1.7.4.15.g7811d
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 20/20] ath6kl: remove-typedef DEV_SCATTER_DMA_VIRTUAL_INFO
2011-03-11 2:55 [PATCH 00/20] ath6kl: first series of cleanups Luis R. Rodriguez
` (18 preceding siblings ...)
2011-03-11 2:55 ` [PATCH 19/20] ath6kl: remove-typedef COMMON_CREDIT_STATE_INFO Luis R. Rodriguez
@ 2011-03-11 2:55 ` Luis R. Rodriguez
2011-03-11 22:28 ` [PATCH 00/20] ath6kl: first series of cleanups Greg KH
20 siblings, 0 replies; 22+ messages in thread
From: Luis R. Rodriguez @ 2011-03-11 2:55 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-wireless, vmehta, naveen.singh, Luis R. Rodriguez
remove-typedef -s DEV_SCATTER_DMA_VIRTUAL_INFO \
"struct dev_scatter_dma_virtual_info" drivers/staging/ath6kl/
Cc: Naveen Singh <naveen.singh@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/staging/ath6kl/htc2/AR6000/ar6k.c | 10 +++++-----
drivers/staging/ath6kl/htc2/AR6000/ar6k.h | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k.c b/drivers/staging/ath6kl/htc2/AR6000/ar6k.c
index 2797b55..a41ed12 100644
--- a/drivers/staging/ath6kl/htc2/AR6000/ar6k.c
+++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k.c
@@ -585,7 +585,7 @@ void DevDumpRegisters(struct ar6k_device *pDev,
}
-#define DEV_GET_VIRT_DMA_INFO(p) ((DEV_SCATTER_DMA_VIRTUAL_INFO *)((p)->HIFPrivate[0]))
+#define DEV_GET_VIRT_DMA_INFO(p) ((struct dev_scatter_dma_virtual_info *)((p)->HIFPrivate[0]))
static HIF_SCATTER_REQ *DevAllocScatterReq(HIF_DEVICE *Context)
{
@@ -754,10 +754,10 @@ static int DevSetupVirtualScatterSupport(struct ar6k_device *pDev)
int status = 0;
int bufferSize, sgreqSize;
int i;
- DEV_SCATTER_DMA_VIRTUAL_INFO *pVirtualInfo;
+ struct dev_scatter_dma_virtual_info *pVirtualInfo;
HIF_SCATTER_REQ *pReq;
- bufferSize = sizeof(DEV_SCATTER_DMA_VIRTUAL_INFO) +
+ bufferSize = sizeof(struct dev_scatter_dma_virtual_info) +
2 * (A_GET_CACHE_LINE_BYTES()) + AR6K_MAX_TRANSFER_SIZE_PER_SCATTER;
sgreqSize = sizeof(HIF_SCATTER_REQ) +
@@ -775,8 +775,8 @@ static int DevSetupVirtualScatterSupport(struct ar6k_device *pDev)
A_MEMZERO(pReq, sgreqSize);
/* the virtual DMA starts after the scatter request struct */
- pVirtualInfo = (DEV_SCATTER_DMA_VIRTUAL_INFO *)((u8 *)pReq + sgreqSize);
- A_MEMZERO(pVirtualInfo, sizeof(DEV_SCATTER_DMA_VIRTUAL_INFO));
+ pVirtualInfo = (struct dev_scatter_dma_virtual_info *)((u8 *)pReq + sgreqSize);
+ A_MEMZERO(pVirtualInfo, sizeof(struct dev_scatter_dma_virtual_info));
pVirtualInfo->pVirtDmaBuffer = &pVirtualInfo->DataArea[0];
/* align buffer to cache line in case host controller can actually DMA this */
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k.h b/drivers/staging/ath6kl/htc2/AR6000/ar6k.h
index 247cf56..3e4ece8 100644
--- a/drivers/staging/ath6kl/htc2/AR6000/ar6k.h
+++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k.h
@@ -322,10 +322,10 @@ int DoMboxHWTest(struct ar6k_device *pDev);
#endif
/* completely virtual */
-typedef struct _DEV_SCATTER_DMA_VIRTUAL_INFO {
+struct dev_scatter_dma_virtual_info {
u8 *pVirtDmaBuffer; /* dma-able buffer - CPU accessible address */
u8 DataArea[1]; /* start of data area */
-} DEV_SCATTER_DMA_VIRTUAL_INFO;
+};
--
1.7.4.15.g7811d
^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [PATCH 00/20] ath6kl: first series of cleanups
2011-03-11 2:55 [PATCH 00/20] ath6kl: first series of cleanups Luis R. Rodriguez
` (19 preceding siblings ...)
2011-03-11 2:55 ` [PATCH 20/20] ath6kl: remove-typedef DEV_SCATTER_DMA_VIRTUAL_INFO Luis R. Rodriguez
@ 2011-03-11 22:28 ` Greg KH
20 siblings, 0 replies; 22+ messages in thread
From: Greg KH @ 2011-03-11 22:28 UTC (permalink / raw)
To: Luis R. Rodriguez; +Cc: gregkh, devel, linux-wireless, vmehta, naveen.singh
On Thu, Mar 10, 2011 at 06:55:27PM -0800, Luis R. Rodriguez wrote:
> Greg, here's the first series of cleanup patches for ath6kl.
> I'm sending only 20, have gone tested by Naveen. I threw in
> the patch from Javier which you requested to be changed. I
> have some more I'll post after these get merged. These all go:
>
> Acked-by: Naveen Singh <naveen.singh@atheros.com>
Next time, add this to the patches please, I didn't want to edit it in
by hand to 20 patches, so I didn't.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 22+ messages in thread
end of thread, other threads:[~2011-03-11 22:33 UTC | newest]
Thread overview: 22+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-11 2:55 [PATCH 00/20] ath6kl: first series of cleanups Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 01/20] staging: ath6kl: Cast variable to size_t to avoid compile warning Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 02/20] ath6kl: s|A_MEMCPY|memcpy|g Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 03/20] ath6kl: s|A_MEMCMP|memcmp|g Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 04/20] ath6kl: remove-typedef: A_UCHAR Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 05/20] ath6kl: remove-typedef AGGR_INFO Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 06/20] ath6kl: remove-typedef AR3K_CONFIG_INFO Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 07/20] ath6kl: remove-typedef AR6000_USER_SETKEYS_INFO Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 08/20] ath6kl: remove-typedef AR6K_ASYNC_REG_IO_BUFFER Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 09/20] ath6kl: remove-typedef AR6K_DEVICE Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 10/20] ath6kl: remove-typedef AR6K_GMBOX_CTRL_REGISTERS Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 11/20] ath6kl: remove-typedef AR6K_GMBOX_INFO Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 12/20] ath6kl: remove-typedef AR6K_HCI_BRIDGE_INFO Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 13/20] ath6kl: remove-typedef AR6K_IRQ_ENABLE_REGISTERS Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 14/20] ath6kl: remove-typedef AR6K_IRQ_PROC_REGISTERS Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 15/20] ath6kl: remove-typedef AR_VIRTUAL_INTERFACE_T Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 16/20] ath6kl: remove-typedef ATHBT_FILTER_INSTANCE Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 17/20] ath6kl: remove-typedef ATH_DEBUG_MASK_DESCRIPTION Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 18/20] ath6kl: remove-typedef BUFFER_PROC_LIST Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 19/20] ath6kl: remove-typedef COMMON_CREDIT_STATE_INFO Luis R. Rodriguez
2011-03-11 2:55 ` [PATCH 20/20] ath6kl: remove-typedef DEV_SCATTER_DMA_VIRTUAL_INFO Luis R. Rodriguez
2011-03-11 22:28 ` [PATCH 00/20] ath6kl: first series of cleanups Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).